Merge pull request #131 from COS301-SE-2023/bugfixing

🐛 price display and saving fix
COS301-SE-2023 · Sep 26, 2023 · aaf62a5 · aaf62a5
2 parents 07dd422 + 653b1c0
commit aaf62a5
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 9 deletions.
diff --git a/backend/src/main/java/fellowship/mealmaestro/models/neo4j/FoodModel.java b/backend/src/main/java/fellowship/mealmaestro/models/neo4j/FoodModel.java
@@ -22,11 +22,14 @@ public class FoodModel {
 
     private String unit;
 
-    public FoodModel(String name, double quantity, String unit, UUID id) {
+    private double price;
+
+    public FoodModel(String name, double quantity, String unit, double price, UUID id) {
         this.id = id;
         this.name = name;
         this.quantity = quantity;
         this.unit = unit;
+        this.price = price;
     }
 
     public FoodModel() {

diff --git a/backend/src/test/java/fellowship/mealmaestro/controllers/PantryControllerTest.java b/backend/src/test/java/fellowship/mealmaestro/controllers/PantryControllerTest.java
@@ -44,7 +44,7 @@ public class PantryControllerTest {
 
     @Test
     public void addToPantrySuccessTest() throws Exception {
-        FoodModel foodModel = new FoodModel("testFood", 2, "testUnit", null);
+        FoodModel foodModel = new FoodModel("testFood", 2, "testUnit", 5.99, null);
 
         // When addToPantry method is called with any FoodModel and any String, it
         // returns foodModel
@@ -64,7 +64,7 @@ public void addToPantrySuccessTest() throws Exception {
 
     @Test
     public void addToPantryBadRequestTest() throws Exception {
-        FoodModel foodModel = new FoodModel("testFood", 2, "testUnit", null);
+        FoodModel foodModel = new FoodModel("testFood", 2, "testUnit", 5.99, null);
 
         // When addToPantry method is called with any FoodModel and any String, it
         // returns foodModel

diff --git a/backend/src/test/java/fellowship/mealmaestro/controllers/ShoppingListControllerTest.java b/backend/src/test/java/fellowship/mealmaestro/controllers/ShoppingListControllerTest.java
@@ -45,7 +45,7 @@ public class ShoppingListControllerTest {
 
     @Test
     public void addToShoppingListSuccessTest() throws Exception {
-        FoodModel foodModel = new FoodModel("testFood", 2, "testUnit", null);
+        FoodModel foodModel = new FoodModel("testFood", 2, "testUnit", 5.99, null);
 
         // When addToShoppingList method is called with any FoodModel and any String, it
         // returns foodModel
@@ -65,7 +65,7 @@ public void addToShoppingListSuccessTest() throws Exception {
 
     @Test
     public void addToShoppingListBadRequestTest() throws Exception {
-        FoodModel foodModel = new FoodModel("testFood", 2, "testUnit", null);
+        FoodModel foodModel = new FoodModel("testFood", 2, "testUnit", 5.99, null);
 
         // When addToShoppingList method is called with any FoodModel and any String, it
         // returns foodModel

diff --git a/frontend/src/app/pages/pantry/pantry.page.html b/frontend/src/app/pages/pantry/pantry.page.html
@@ -176,6 +176,13 @@
               </ion-item>
             </ion-col>
           </ion-row>
+          <ion-row>
+            <ion-item
+              *ngIf="newItem.price !== -1 && newItem.price !== undefined"
+            >
+              <ion-label class="price">Price: R{{newItem.price}}</ion-label>
+            </ion-item>
+          </ion-row>
         </ion-grid>
       </ion-content>
     </ng-template>

diff --git a/frontend/src/app/pages/pantry/pantry.page.scss b/frontend/src/app/pages/pantry/pantry.page.scss
@@ -90,3 +90,10 @@ ion-item.fixed-price {
   color: #656565;
   font-size: 20px;
 }
+
+ion-label.price {
+  font-weight: bold;
+  font-family: "Roboto", sans-serif;
+  color: #656565;
+  font-size: 20px;
+}
diff --git a/frontend/src/app/pages/pantry/pantry.page.ts b/frontend/src/app/pages/pantry/pantry.page.ts
@@ -70,14 +70,12 @@ export class PantryPage implements OnInit, ViewWillEnter {
     private alertController: AlertController
   ) {}
 
-
   async ngOnInit() {
     BarcodeScanner.isSupported().then((result) => {
       this.isBarcodeSupported = result.supported;
     });
   }
 
-
   async ionViewWillEnter() {
     if (!this.loginService.isPantryRefreshed()) {
       this.fetchItems();
@@ -315,6 +313,7 @@ export class PantryPage implements OnInit, ViewWillEnter {
         this.totalShoppingPrice += item.price;
       }
     });
+    this.totalShoppingPrice = Math.round(this.totalShoppingPrice * 100) / 100;
   }
 
   closeSlidingItems() {
@@ -489,7 +488,7 @@ export class PantryPage implements OnInit, ViewWillEnter {
     const granted = await this.requestPermissions();
     if (!granted) {
       this.errorHandlerService.presentErrorToast(
-        'Please grant camera permissions to use this feature',
+        'No camera permissions',
         'Camera permissions not granted'
       );
       return;
@@ -508,7 +507,7 @@ export class PantryPage implements OnInit, ViewWillEnter {
     // let result = {
     //   barcodes: [
     //     {
-    //       displayValue: '13761238123', // for testing
+    //       displayValue: '6003678902458', // for testing
     //     },
     //   ],
     // };

diff --git a/frontend/src/app/services/pantry-api/pantry-api.service.ts b/frontend/src/app/services/pantry-api/pantry-api.service.ts
@@ -26,6 +26,7 @@ export class PantryApiService {
         name: item.name,
         quantity: item.quantity,
         unit: item.unit,
+        price: item.price,
       },
       { observe: 'response' }
     );

diff --git a/frontend/src/app/services/shopping-list-api/shopping-list-api.service.ts b/frontend/src/app/services/shopping-list-api/shopping-list-api.service.ts
@@ -26,6 +26,7 @@ export class ShoppingListApiService {
         name: item.name,
         quantity: item.quantity,
         unit: item.unit,
+        price: item.price,
       },
       { observe: 'response' }
     );