Merge pull request #26 from RIT-SWEN-261-02/checkout-improvement

Checkout improvement

1 files changed, 18 insertions, 49 deletions

diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
index 847baee..5d94124 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
@@ -2,7 +2,7 @@ import {Component, Input, OnInit, ViewChild} from '@angular/core';
 import {UsersService} from '../../services/users.service';
 import {Router} from '@angular/router';
 import {CupboardService} from '../../services/cupboard.service';
-import {catchError, firstValueFrom, Observable} from 'rxjs';
+import {firstValueFrom} from 'rxjs';
 import {AuthService} from '../../services/auth.service';
 import {ToastsService, ToastType} from '../../services/toasts.service';
 
@@ -23,7 +23,6 @@ export class FundingBasketComponent implements OnInit {
     ) {}
 
     @ViewChild("contribution") contribution?: Input;
-    @Input() isValid: boolean = true;
 
     // this is for login rerouting
     ngOnInit(): void {
@@ -33,62 +32,32 @@ export class FundingBasketComponent implements OnInit {
         }
 
         this.usersService.refreshBasket();
-        // this.usersService.removeNeed(); <- call this to remove
     }
 
     async checkout() {
-        this.isValid = true;
-        for (let c of document.querySelectorAll('.contribution')!) {
-            let contribution = c as HTMLInputElement;
-            contribution.setAttribute("style", "");
-            if (contribution.value == '' || contribution.valueAsNumber <= 0) {
-                this.isValid = false;
+        let order: { needID: number, quantity: number }[] = []
 
+        for (let contribution of document.querySelectorAll<HTMLInputElement>('.contribution')!) {
+            if (contribution.value == '' || contribution.valueAsNumber <= 0) {
                 contribution.setAttribute("style", "border-color: #ff0000");
                 this.toastService.sendToast(ToastType.ERROR, "Invalid input in funding basket!")
-
-                setTimeout(() => {
-                    contribution.setAttribute("style", "border-color: #ffffff");
-                }, 3000);
+                return;
             }
+            order.push({needID: +contribution.id, quantity: contribution.valueAsNumber});
         }
-        // if (this.usersService.getBasket().value != await firstValueFrom(this.usersService.getUser(1))
-        // for (let c of this.usersService.getBasket().value) {
-        //     if (c == null) {
-        //         this.isValid = false;
-        //         this.statusText.next("One or more needs have been deleted")
-        //     } else {
-        //         this.statusText.next("test")
-        //     }
-        // }
-        if (this.isValid) {
-            for (let c of document.querySelectorAll('.contribution')!) {
-                let contribution = c as HTMLInputElement;
-                let need = await firstValueFrom(this.cupboardService.getNeed(+contribution.id));
-                need.current += +contribution.value;
-                this.usersService.removeNeed(+need.id);
-                this.cupboardService.checkoutNeed(need.id, +contribution.value)
-                    .pipe(catchError((ex, _) => {
-                        if (ex.status == 500) {
-                            this.toastService.sendToast(ToastType.ERROR, 'Fields cannot be blank');
-                        } else if (ex.status == 400) {
-                            this.toastService.sendToast(ToastType.ERROR, ex.error);
-                        } else {
-                            this.toastService.sendToast(ToastType.ERROR, 'Error on creating need');
-                        }
-                        return new Observable<string>();
-                    }))
-                    .subscribe((result) => {
-                        if (result) {
-                            //this.needList?.refresh()
-                        } else {
-                            console.log('need update failed');
-                        }
-                        this.toastService.sendToast(ToastType.INFO, "Checkout successful");
-                    });
-            }
+
+        try {
+            await firstValueFrom(this.cupboardService.checkoutNeed(order))
+        } catch (ex:any) {
+            this.toastService.sendToast(ToastType.ERROR, ex.error);
+            return
         }
-    }
 
+        order.forEach(contribution => this.usersService.removeNeed(contribution.needID))
+        this.toastService.sendToast(ToastType.INFO, "Checkout successful");
+    }
 
+    resetColor(ev: any) {
+        (ev.target as HTMLInputElement).setAttribute("style", "border-color: unset")
+    }
 }