From ed1d6fe0f2f5da4a70d2c68f307e253ac7be9243 Mon Sep 17 00:00:00 2001
From: JULLIEN Baptiste <baptiste.jullien@telecomnancy.eu>
Date: Mon, 29 Apr 2024 21:03:41 +0200
Subject: [PATCH] fix(api): getAllRestock was giving deleted restock

---
 backend/internal/db/mongo/restock_misc.go | 26 +++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/backend/internal/db/mongo/restock_misc.go b/backend/internal/db/mongo/restock_misc.go
index c1d7932..d24eed4 100644
--- a/backend/internal/db/mongo/restock_misc.go
+++ b/backend/internal/db/mongo/restock_misc.go
@@ -51,7 +51,18 @@ func (b *Backend) GetAllRestocks(ctx context.Context, page uint64, size uint64)
 	ctx, cancel := b.TimeoutContext(ctx)
 	defer cancel()
 
-	filter := bson.M{}
+	filter := bson.M{
+		"$or": []bson.M{
+			{
+				"deleted_at": bson.M{
+					"$exists": false,
+				},
+			},
+			{
+				"deleted_at": nil,
+			},
+		},
+	}
 
 	// Get "size" restocks from "page" using aggregation
 	var restocks []*models.Restock
@@ -72,7 +83,18 @@ func (b *Backend) CountAllRestocks(ctx context.Context) (uint64, error) {
 	ctx, cancel := b.TimeoutContext(ctx)
 	defer cancel()
 
-	filter := bson.M{}
+	filter := bson.M{
+		"$or": []bson.M{
+			{
+				"deleted_at": bson.M{
+					"$exists": false,
+				},
+			},
+			{
+				"deleted_at": nil,
+			},
+		},
+	}
 
 	count, err := b.db.Collection(RestocksCollection).CountDocuments(ctx, filter)
 	if err != nil {