Merge pull request #143 from RemiF1908/feature/sort-out-of-stock-last

feat(front): items oos displayed at end

Author: aripot007

backend/api/course.go

@@ -20,7 +20,7 @@ func (s *Server) GetCourse(c echo.Context, params autogen.GetCourseParams) error
 	}
 	var course []autogen.CourseItem
 
-	data, err := s.DBackend.GetItems(c.Request().Context(), "", 0, 0, "", "", search)
+	data, err := s.DBackend.GetItems(c.Request().Context(), "", 0, 0, "", "", search, false)
 	if err != nil {
 		logrus.Error(err)
 		return Error500(c)

backend/api/items.go

@@ -43,7 +43,7 @@ func (s *Server) GetCategoryItems(c echo.Context, categoryId autogen.UUID, param
 	// Make sure the last page is not empty
 	dbpage, page, limit, maxPage := autogen.Pager(params.Page, params.Limit, &count)
 
-	data, err := s.DBackend.GetItems(c.Request().Context(), categoryId.String(), dbpage, limit, state, "", "")
+	data, err := s.DBackend.GetItems(c.Request().Context(), categoryId.String(), dbpage, limit, state, "", "", true)
 	if err != nil {
 		return Error500(c)
 	}
@@ -270,7 +270,7 @@ func (s *Server) GetAllItems(c echo.Context, params autogen.GetAllItemsParams) e
 	// Make sure the last page is not empty
 	dbpage, page, limit, maxPage := autogen.Pager(params.Page, params.Limit, &count)
 
-	data, err := s.DBackend.GetItems(c.Request().Context(), categoryId, dbpage, limit, state, name, fournisseur)
+	data, err := s.DBackend.GetItems(c.Request().Context(), categoryId, dbpage, limit, state, name, fournisseur, false)
 	if err != nil {
 		logrus.Error(err)
 		return Error500(c)

backend/internal/db/database.go

@@ -173,7 +173,7 @@ type DBackend interface {
 	CountAccounts(ctx context.Context, query string) (uint64, error)
 	GetRefills(ctx context.Context, account string, page uint64, size uint64, startAt, endAt uint64) ([]*models.Refill, error)
 	CountRefills(ctx context.Context, account string, startAt, endAt uint64) (uint64, error)
-	GetItems(ctx context.Context, categoryID string, page, size uint64, state string, name string, fournisseur string) ([]*models.Item, error)
+	GetItems(ctx context.Context, categoryID string, page, size uint64, state string, name string, fournisseur string, sort bool) ([]*models.Item, error)
 	GetIncoherentItems(ctx context.Context, page, size uint64, categoryID string, state string, name string) ([]*models.Item, error)
 	CountItems(ctx context.Context, categoryID string, state string, name string, fournisseur string) (uint64, error)
 	CountIncoherentItems(ctx context.Context, categoryID string, state string, name string) (uint64, error)

backend/internal/db/mongo/item_misc.go

@@ -11,13 +11,13 @@ import (
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
-func (b *Backend) GetItems(ctx context.Context, categoryID string, page, size uint64, state string, name string, fournisseur string) ([]*models.Item, error) {
+func (b *Backend) GetItems(ctx context.Context, categoryID string, page, size uint64, state string, name string, fournisseur string, sort bool) ([]*models.Item, error) {
 	ctx, cancel := b.TimeoutContext(ctx)
 	defer cancel()
 
 	var items []*models.Item
 
-	filter := bson.M{
+	matchFilter := bson.M{
 		"$or": []bson.M{
 			{
 				"deleted_at": bson.M{
@@ -30,12 +30,12 @@ func (b *Backend) GetItems(ctx context.Context, categoryID string, page, size ui
 		},
 	}
 	if state != "" {
-		filter["state"] = state
+		matchFilter["state"] = state
 		if state == string(autogen.ItemBuyable) {
-			// Get seconds since day start
+						// Get seconds since day start
 			t := time.Since(time.Now().Truncate(24 * time.Hour)).Seconds()
 			// available_from <= t <= available_until or (available_from == nil && available_until == nil)
-			filter["$and"] = []bson.M{
+			matchFilter["$and"] = []bson.M{
 				{
 					"$or": []bson.M{
 						{
@@ -64,19 +64,51 @@ func (b *Backend) GetItems(ctx context.Context, categoryID string, page, size ui
 		}
 	}
 	if categoryID != "" {
-		filter["category_id"] = uuid.MustParse(categoryID)
+		matchFilter["category_id"] = uuid.MustParse(categoryID)
 	}
 	if name != "" {
-		filter["name"] = bson.M{
+		matchFilter["name"] = bson.M{
 			"$regex":   name,
 			"$options": "i",
 		}
 	}
 	if fournisseur != "" {
-		filter["fournisseur"] = fournisseur
+		matchFilter["fournisseur"] = fournisseur
 	}
 
-	cursor, err := b.db.Collection(ItemsCollection).Find(ctx, filter, options.Find().SetSkip(int64(page*size)).SetLimit(int64(size)))
+	pipeline := []bson.M{
+		{"$match": matchFilter},
+	}
+
+	if sort {
+		pipeline = append(pipeline, bson.M{
+			"$addFields": bson.M{
+				"sortPriority": bson.M{
+					"$cond": bson.A{
+						bson.M{"$eq": bson.A{"$amount_left", 0}},
+						2, 
+						1,
+					},
+				},
+			},
+		})
+
+		pipeline = append(pipeline, bson.M{
+			"$sort": bson.D{
+				{"sortPriority", 1},
+			},
+		})
+	}
+	pipeline = append(pipeline, bson.M{"$skip": int64(page * size)})
+	pipeline = append(pipeline, bson.M{"$limit": int64(size)})
+
+	if sort {
+		pipeline = append(pipeline, bson.M{
+			"$project": bson.M{"sortPriority": 0},
+		})
+	}
+
+	cursor, err := b.db.Collection(ItemsCollection).Aggregate(ctx, pipeline)
 	if err != nil {
 		return nil, err
 	}