From bb86a51b05777aad734fb1d8969290d495a5a453 Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Sat, 15 Oct 2022 13:29:33 -0800
Subject: [PATCH] feat: order labels and locations by name (#86)

* order labels and locations by name

* sort items
---
 backend/internal/repo/repo_items.go     | 4 +++-
 backend/internal/repo/repo_labels.go    | 1 +
 backend/internal/repo/repo_locations.go | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/internal/repo/repo_items.go b/backend/internal/repo/repo_items.go
index 7dd81ae..64715ca 100644
--- a/backend/internal/repo/repo_items.go
+++ b/backend/internal/repo/repo_items.go
@@ -24,6 +24,7 @@ type (
 		Search      string      `json:"search"`
 		LocationIDs []uuid.UUID `json:"locationIds"`
 		LabelIDs    []uuid.UUID `json:"labelIds"`
+		SortBy      string      `json:"sortBy"`
 	}
 
 	ItemCreate struct {
@@ -252,7 +253,8 @@ func (e *ItemsRepository) QueryByGroup(ctx context.Context, gid uuid.UUID, q Ite
 	}
 
 	items, err := mapItemsSummaryErr(
-		qb.WithLabel().
+		qb.Order(ent.Asc(item.FieldName)).
+			WithLabel().
 			WithLocation().
 			All(ctx),
 	)
diff --git a/backend/internal/repo/repo_labels.go b/backend/internal/repo/repo_labels.go
index 567b3f8..b899d68 100644
--- a/backend/internal/repo/repo_labels.go
+++ b/backend/internal/repo/repo_labels.go
@@ -84,6 +84,7 @@ func (r *LabelRepository) GetOneByGroup(ctx context.Context, gid, ld uuid.UUID)
 func (r *LabelRepository) GetAll(ctx context.Context, groupId uuid.UUID) ([]LabelSummary, error) {
 	return mapLabelsOut(r.db.Label.Query().
 		Where(label.HasGroupWith(group.ID(groupId))).
+		Order(ent.Asc(label.FieldName)).
 		WithGroup().
 		All(ctx),
 	)
diff --git a/backend/internal/repo/repo_locations.go b/backend/internal/repo/repo_locations.go
index 7494690..8a60202 100644
--- a/backend/internal/repo/repo_locations.go
+++ b/backend/internal/repo/repo_locations.go
@@ -94,7 +94,9 @@ func (r *LocationRepository) GetAll(ctx context.Context, groupId uuid.UUID) ([]L
 			locations
 		WHERE
 			locations.group_locations = ?
-	`
+		ORDER BY
+			locations.name ASC
+`
 
 	rows, err := r.db.Sql().QueryContext(ctx, query, groupId)
 	if err != nil {