Merge pull request #53 from dikstub-rssa/fix/anything-moko

add sort

internal/domain/main-entities/district/dto.go

@@ -16,6 +16,7 @@ type ReadListDto struct {
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
 	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 

internal/domain/main-entities/province/dto.go

@@ -15,6 +15,7 @@ type ReadListDto struct {
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
 	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 

internal/domain/main-entities/regency/dto.go

@@ -16,6 +16,7 @@ type ReadListDto struct {
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
 	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 

internal/domain/main-entities/village/dto.go

@@ -15,6 +15,7 @@ type ReadListDto struct {
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
 	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 

internal/use-case/main-use-case/district/lib.go

@@ -53,7 +53,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
+
+	tx = plh.Sort(input.Sort, tx)
 
 	tx = tx.
 		Model(&e.District{}).

internal/use-case/main-use-case/province/lib.go

@@ -55,6 +55,8 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr
 
 	tx = plh.SearchCodeOrName(input.Search, tx)
 
+	tx = plh.Sort(input.Sort, tx)
+
 	tx = tx.
 		Model(&e.Province{}).
 		Scopes(gh.Filter(input.FilterDto)).

internal/use-case/main-use-case/regency/lib.go

@@ -55,6 +55,8 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Re
 
 	tx = plh.SearchCodeOrName(input.Search, tx)
 
+	tx = plh.Sort(input.Sort, tx)
+
 	tx = tx.
 		Model(&e.Regency{}).
 		Scopes(gh.Filter(input.FilterDto)).

internal/use-case/main-use-case/village/lib.go

@@ -55,6 +55,8 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Vi
 
 	tx = plh.SearchCodeOrName(input.Search, tx)
 
+	tx = plh.Sort(input.Sort, tx)
+
 	tx = tx.
 		Model(&e.Village{}).
 		Scopes(gh.Filter(input.FilterDto)).

pkg/lib-helper/lib-helper.go

@@ -3,6 +3,8 @@ package libhelper
 import (
 	"fmt"
 	pl "simrs-vx/pkg/logger"
+	"strings"
+	"unicode"
 
 	"github.com/jackc/pgx/v5/pgconn"
 	"gorm.io/gorm"
@@ -16,6 +18,59 @@ func SearchCodeOrName(search string, tx *gorm.DB) *gorm.DB {
 	return tx
 }
 
+func Sort(sort string, tx *gorm.DB) *gorm.DB {
+	if sort == "" {
+		return tx
+	}
+
+	pairs := strings.Split(sort, ",")
+	for _, pair := range pairs {
+		parts := strings.Split(strings.TrimSpace(pair), "=")
+		if len(parts) != 2 {
+			continue // skip invalid format
+		}
+
+		field := strings.TrimSpace(parts[0])
+		direction := strings.ToUpper(strings.TrimSpace(parts[1]))
+
+		if direction != "ASC" && direction != "DESC" {
+			continue
+		}
+
+		field = normalizeColumnName(field)
+
+		tx = tx.Order(fmt.Sprintf("\"%s\" %s", field, direction))
+	}
+
+	return tx
+}
+
+func normalizeColumnName(input string) string {
+	if input == "" {
+		return input
+	}
+
+	input = strings.ReplaceAll(input, "-", "_")
+
+	runes := []rune(input)
+	var out []rune
+	upperNext := true
+	for _, r := range runes {
+		if r == '_' {
+			out = append(out, r)
+			upperNext = true
+			continue
+		}
+		if upperNext {
+			out = append(out, unicode.ToUpper(r))
+			upperNext = false
+		} else {
+			out = append(out, r)
+		}
+	}
+	return string(out)
+}
+
 func HandleCreateError(input any, event *pl.Event, err error) error {
 	e, ok := err.(*pgconn.PgError)
 	if !ok {