Fix getting products by restaurant id

blaz-cerpnjak · Mar 20, 2024 · 2e86346 · 2e86346
1 parent 263ccd6
commit 2e86346
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/RestaurantManagementAPI/src/main/kotlin/com/blazc/controller/ProductController.kt b/RestaurantManagementAPI/src/main/kotlin/com/blazc/controller/ProductController.kt
@@ -1,7 +1,7 @@
 package com.blazc.controller
 
-import com.blazc.repository.ProductRepository
 import com.blazc.model.Product
+import com.blazc.repository.ProductRepository
 import io.smallrye.mutiny.Uni
 import jakarta.inject.Inject
 import jakarta.ws.rs.*
@@ -42,17 +42,20 @@ class ProductController {
         return productRepository.findById(objectId)
     }
 
-    @GET
-    @Produces(MediaType.APPLICATION_JSON)
-    fun getAllProducts(): Uni<List<Product>> {
-        return productRepository.getAll()
-    }
-
     @GET
     @Path("/restaurant/{id}")
     @Produces(MediaType.APPLICATION_JSON)
     fun getAllProductsByRestaurantId(@PathParam("id") restaurantId: String): Uni<List<Product>> {
-        return productRepository.getAllByRestaurantId(restaurantId)
+        val objectId: ObjectId
+
+        try {
+            objectId = ObjectId(restaurantId)
+        } catch (e: Exception) {
+            LOG.error("Error parsing id", e)
+            return Uni.createFrom().failure(e)
+        }
+
+        return productRepository.getAllByRestaurantId(objectId)
     }
 
 

diff --git a/RestaurantManagementAPI/src/main/kotlin/com/blazc/repository/ProductRepository.kt b/RestaurantManagementAPI/src/main/kotlin/com/blazc/repository/ProductRepository.kt
@@ -4,6 +4,7 @@ import com.blazc.model.Product
 import io.quarkus.mongodb.panache.reactive.ReactivePanacheMongoRepository
 import io.smallrye.mutiny.Uni
 import jakarta.enterprise.context.ApplicationScoped
+import org.bson.types.ObjectId
 
 @ApplicationScoped
 class ProductRepository: ReactivePanacheMongoRepository<Product> {
@@ -12,12 +13,8 @@ class ProductRepository: ReactivePanacheMongoRepository<Product> {
         return persist(product)
     }
 
-    fun getAllByRestaurantId(restaurantId: String): Uni<List<Product>> {
+    fun getAllByRestaurantId(restaurantId: ObjectId): Uni<List<Product>> {
         return find("restaurantId", restaurantId).list()
     }
 
-    fun getAll(): Uni<List<Product>> {
-        return listAll()
-    }
-
 }