Add image field to product

blaz-cerpnjak · Apr 10, 2024 · d30197c · d30197c
1 parent c4a9939
commit d30197c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/API_GatewayWeb/DataStructures/main.go b/API_GatewayWeb/DataStructures/main.go
@@ -26,6 +26,7 @@ type Product struct {
 	RestaurantId primitive.ObjectID `json:"restaurantId" bson:"restaurantId"`
 	Name         string             `json:"name" bson:"name"`
 	Price        int32              `json:"price" bson:"price"` // in cents
+	Image        string             `json:"image" bson:"image"`
 }
 
 type Order struct {

diff --git a/API_GatewayWeb/DataStructures/order_service.proto b/API_GatewayWeb/DataStructures/order_service.proto
@@ -57,6 +57,7 @@ message Product {
   string id = 1;
   string name = 2;
   int32 price = 3;
+  string image = 4;
 }
 
 enum PaymentType {

diff --git a/OrderProcessingAPI/src/main/kotlin/com/blazc/model/product/Product.kt b/OrderProcessingAPI/src/main/kotlin/com/blazc/model/product/Product.kt
@@ -7,21 +7,24 @@ import org.bson.types.ObjectId
 data class Product(
     var id: ObjectId? = null,
     var name: String,
-    var price: Int // 100 = 1
+    var price: Int, // 100 = 1
+    var image: String
 ) {
 
     constructor() : this(
         id = ObjectId(),
         name = "",
-        price = 0
+        price = 0,
+        image = ""
     )
 
     companion object {
         fun fromGrpc(productGrpc: OrderGrpc.Product): Product {
             return Product(
                 id = ObjectId(productGrpc.id),
                 name = productGrpc.name,
-                price = productGrpc.price
+                price = productGrpc.price,
+                image = productGrpc.image
             )
         }
 
@@ -30,6 +33,7 @@ data class Product(
                 .setId(product.id.toString())
                 .setName(product.name)
                 .setPrice(product.price)
+                .setImage(product.image)
                 .build()
         }
     }

diff --git a/OrderProcessingAPI/src/main/proto/order_service.proto b/OrderProcessingAPI/src/main/proto/order_service.proto
@@ -57,6 +57,7 @@ message Product {
   string id = 1;
   string name = 2;
   int32 price = 3;
+  string image = 4;
 }
 
 enum PaymentType {

diff --git a/RestaurantManagementAPI/src/main/kotlin/com/blazc/controller/ProductController.kt b/RestaurantManagementAPI/src/main/kotlin/com/blazc/controller/ProductController.kt
@@ -26,6 +26,12 @@ class ProductController {
         return productRepository.create(product)
     }
 
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    fun getAllProducts(): Uni<List<Product>> {
+        return productRepository.listAll()
+    }
+
     @GET
     @Path("/{id}")
     @Produces(MediaType.APPLICATION_JSON)

diff --git a/RestaurantManagementAPI/src/main/kotlin/com/blazc/model/Product.kt b/RestaurantManagementAPI/src/main/kotlin/com/blazc/model/Product.kt
@@ -6,5 +6,6 @@ class Product {
     var id: ObjectId? = null
     lateinit var restaurantId: ObjectId
     lateinit var name: String
+    lateinit var image: String
     var price: Int = 0 // 100 = 1
 }