fix: sorting

cmd/input_dialog.go

@@ -1,8 +1,8 @@
 package cmd
 
 import (
+	"github.com/opbnq-q/nto-cli/model"
 	"log"
-	"nto_cli/model"
 	"os"
 
 	"github.com/rivo/tview"

generation/gen.go

@@ -1,9 +1,9 @@
 package generation
 
 import (
+	"github.com/opbnq-q/nto-cli/model"
+	"github.com/opbnq-q/nto-cli/utils"
 	"log"
-	"nto_cli/model"
-	"nto_cli/utils"
 	"os"
 	"path/filepath"
 	"strings"

generation/scheme.go

@@ -3,9 +3,9 @@ package generation
 import (
 	_ "embed"
 	"fmt"
+	"github.com/opbnq-q/nto-cli/model"
+	"github.com/opbnq-q/nto-cli/utils"
 	"log"
-	"nto_cli/model"
-	"nto_cli/utils"
 	"os"
 	"path/filepath"
 	"strings"

generation/service.go

@@ -3,9 +3,9 @@ package generation
 import (
 	_ "embed"
 	"fmt"
+	"github.com/opbnq-q/nto-cli/model"
+	"github.com/opbnq-q/nto-cli/utils"
 	"log"
-	"nto_cli/model"
-	"nto_cli/utils"
 	"os"
 	"path/filepath"
 	"strings"

generation/templates/service.tmpl

@@ -33,7 +33,17 @@ export default class {{.ModelName}}Service implements IService<{{.ModelName}}> {
 		return await SearchByAllTextFields(input) as {{ .ModelName }}[]
 	}
 
-	async sort(options: SortOptions<{{ .ModelName }}>) {
+	async sort(options: SortOptions<Task>) {
-		return await SortedByOrder(Object.entries(options).map(item => ({Name: item[0], Order: item[1]}))) as {{ .ModelName }}[]
+    return (await SortedByOrder(
-	}
+      Object.entries(options).map((item) => {
+        if (item[1] !== 'NONE') {
+          return ({
+            Name: item[0],
+            Order: item[1],
+          })
+        }
+      }).filter(item => !!item)
+    )) as Task[];
+  }
+}
 }

model/get_not_implemented_models.go

@@ -1,6 +1,6 @@
 package model
 
-import "nto_cli/utils"
+import "github.com/opbnq-q/nto-cli/utils"
 
 func GetNotImplementedModels(models []Model) []Model {
 	var unimplementedModels []Model

model/parse_models.go

@@ -1,11 +1,11 @@
 package model
 
 import (
+	"github.com/opbnq-q/nto-cli/utils"
 	"go/ast"
 	"go/parser"
 	"go/token"
 	"log/slog"
-	"nto_cli/utils"
 	"os"
 	"path/filepath"
 	"strings"