Merge pull request #35 from rizalgowandy/arwego/feat/sortx_v2

Improve Sortx Information

Author: rizalgowandy

pkg/sortx/sortx.go

@@ -1,20 +1,23 @@
 package sortx
 
-import "strings"
+import (
+	"strings"
+)
 
 type (
 	Key   string
-	Order int64
+	Order string
 )
 
 const (
-	OrderAscending Order = iota + 1
-	OrderDescending
+	OrderAscending  Order = "ASC"
+	OrderDescending Order = "DESC"
 )
 
 type Sort struct {
-	Key   Key
-	Order Order
+	Key      Key
+	Order    Order
+	Original string
 }
 
 // NewSorts create sorting based on
@@ -28,11 +31,12 @@ func NewSorts(qs string) []Sort {
 		kv := strings.Split(v, ":")
 
 		s := Sort{
-			Key:   Key(kv[0]),
-			Order: OrderAscending,
+			Key:      Key(strings.ToLower(kv[0])),
+			Order:    OrderAscending,
+			Original: strings.ToLower(v),
 		}
 		if len(kv) == 2 {
-			switch kv[1] {
+			switch strings.ToLower(kv[1]) {
 			case "asc":
 				s.Order = OrderAscending
 			case "desc":

pkg/sortx/sortx_test.go

@@ -21,16 +21,42 @@ func TestNewSorts(t *testing.T) {
 			},
 			want: []Sort{
 				{
-					Key:   "id",
-					Order: OrderDescending,
+					Key:      "id",
+					Order:    OrderDescending,
+					Original: "id:desc",
 				},
 				{
-					Key:   "status",
-					Order: OrderAscending,
+					Key:      "status",
+					Order:    OrderAscending,
+					Original: "status:asc",
 				},
 				{
-					Key:   "created_at",
-					Order: OrderAscending,
+					Key:      "created_at",
+					Order:    OrderAscending,
+					Original: "created_at",
+				},
+			},
+		},
+		{
+			name: "Success with different case",
+			args: args{
+				qs: "ID:DESC,Status:Asc,created_at",
+			},
+			want: []Sort{
+				{
+					Key:      "id",
+					Order:    OrderDescending,
+					Original: "id:desc",
+				},
+				{
+					Key:      "status",
+					Order:    OrderAscending,
+					Original: "status:asc",
+				},
+				{
+					Key:      "created_at",
+					Order:    OrderAscending,
+					Original: "created_at",
 				},
 			},
 		},