Merge pull request #69 from SLIIT-Y3S2/dev

Dev

backend/src/__tests__/item.test.ts

@@ -27,6 +27,10 @@ export const userPayload = {
   contactNumber: "0712345678",
 };
 
+
+/**
+ * Main test suite
+ */
 describe("site", () => {
   beforeAll(async () => {
     const mongoServer = await MongoMemoryServer.create();
@@ -37,15 +41,21 @@ describe("site", () => {
     await mongoose.disconnect();
     await mongoose.connection.close();
   });
+
+  /**
+   * Sub test suite 1 - POST operation
+   */
   describe("create item route", () => {
     describe("given the user is not logged in", () => {
+      /* failure scenario */
       it("should return a 403", async () => {
         const { statusCode } = await supertest(app).post("/api/items");
 
         expect(statusCode).toBe(403);
       });
     });
     describe("given the user is logged in", () => {
+      /* success scenario */
       it("should return a 200 and create the item", async () => {
         const jwt = signJwt(userPayload);
 
@@ -60,14 +70,20 @@ describe("site", () => {
       });
     });
   });
+
+  /**
+   * Sub test suite 2 - GET operation (all)
+   */
   describe("get item list route", () => {
     describe("given the user is not logged in", () => {
+      /* failure scenario */
       it("should return a 403", async () => {
         const { statusCode } = await supertest(app).get("/api/items");
         expect(statusCode).toBe(403);
       });
     });
     describe("given the user is logged in", () => {
+      /* success scenario */
       it("should return a 200 and get the item list", async () => {
         const jwt = signJwt(userPayload);
 
@@ -81,8 +97,13 @@ describe("site", () => {
       });
     });
   });
+
+  /**
+   * Sub test suite 3 - update site
+   */
   describe("update item route", () => {
     describe("given the user is not logged in", () => {
+      /* failure scenario */
       it("should return a 403", async () => {
         const oldItem = await createItem(itemPayload);
         const { statusCode } = await supertest(app).put(
@@ -93,6 +114,7 @@ describe("site", () => {
       });
     });
     describe("given the user is logged in", () => {
+      /* success scenario */
       it("should return a 200 and update the item", async () => {
         const jwt = signJwt(userPayload);
 

backend/src/__tests__/site.test.ts

@@ -27,6 +27,10 @@ export const userPayload = {
   contactNumber: "0712345678",
 };
 
+
+/**
+ * Main test suite
+ */
 describe("site", () => {
   beforeAll(async () => {
     const mongoServer = await MongoMemoryServer.create();
@@ -37,8 +41,14 @@ describe("site", () => {
     await mongoose.disconnect();
     await mongoose.connection.close();
   });
+
+
+  /**
+   * Sub test suite 1 - POST operation
+   */
   describe("create site route", () => {
     describe("given the user is not logged in", () => {
+      /* failure scenario */
       it("should return a 403", async () => {
         const { statusCode } = await supertest(app).post("/api/sites");
 
@@ -47,6 +57,7 @@ describe("site", () => {
     });
 
     describe("given the user is logged in", () => {
+      /* success scenario */
       it("should return a 200 and create the site", async () => {
         const jwt = signJwt(userPayload);
 
@@ -62,8 +73,12 @@ describe("site", () => {
     });
   });
 
+  /**
+   * Sub test suite 2 - GET operation (all)
+   */
   describe("get sites list route", () => {
     describe("given the user is not logged in", () => {
+      /* failure scenario */
       it("should return a 403", async () => {
         const { statusCode } = await supertest(app).get("/api/sites");
 
@@ -72,6 +87,7 @@ describe("site", () => {
     });
 
     describe("given the user is logged in", () => {
+      /* success scenario */
       it("should return a 200 and the sites", async () => {
         const jwt = signJwt(userPayload);
 
@@ -92,8 +108,12 @@ describe("site", () => {
     });
   });
 
+  /**
+   * Sub test suite 3 - GET operation (particular site)
+   */
   describe("get site by id route", () => {
     describe("given the site does not exist", () => {
+      /* failure scenario */
       it("should return a 404", async () => {
         const siteId = "site-123";
         const jwt = signJwt(userPayload);
@@ -106,6 +126,7 @@ describe("site", () => {
     });
 
     describe("given the site does exist", () => {
+      /* success scenario */
       it("should return a 200 status and the site", async () => {
         const site = await createSite(sitePayload);
         const jwt = signJwt(userPayload);
@@ -121,8 +142,12 @@ describe("site", () => {
     });
   });
 
+  /**
+   * Sub test suite 4 - update site
+   */
   describe("update site route", () => {
     describe("given the user is not logged in", () => {
+      /* failure scenario */
       it("should return a 403", async () => {
         const site = await createSite(sitePayload);
         const { statusCode } = await supertest(app).put(
@@ -133,6 +158,7 @@ describe("site", () => {
     });
 
     describe("given the user is logged in", () => {
+      /* success scenario */
       it("should return a 200 and update the site", async () => {
         const site = await createSite(sitePayload);
         const jwt = signJwt(userPayload);

backend/src/__tests__/user-management.test.ts

@@ -28,6 +28,9 @@ const userInput: CreateUserInput["body"] = {
   contactNumber: "0712345678",
 };
 
+/**
+ * Main test suite
+ */
 describe("user-management", () => {
   beforeAll(async () => {
     const mongoServer = await MongoMemoryServer.create();
@@ -38,8 +41,12 @@ describe("user-management", () => {
     await mongoose.connection.close();
   });
 
+  /**
+   * Sub test suite 1 - POST operation
+   */
   describe("create user route", () => {
     describe("given the user is not logged in", () => {
+      /* failure scenario */
       it("should return a 403", async () => {
         const { statusCode } = await supertest(app).post(
           "/api/user-management"
@@ -50,6 +57,7 @@ describe("user-management", () => {
     });
 
     describe("given the user is logged in", () => {
+      /* success scenario */
       it("should return a 201 and create the user", async () => {
         const jwt = signJwt(userPayload);
 
@@ -65,8 +73,12 @@ describe("user-management", () => {
     });
   });
 
+  /**
+   * Sub test suite 2 - GET operation (all)
+   */
   describe("get user list route", () => {
     describe("given the user is not logged in", () => {
+      /* failure scenario */
       it("should return a 403", async () => {
         const { statusCode } = await supertest(app).get("/api/user-management");
 
@@ -75,6 +87,7 @@ describe("user-management", () => {
     });
 
     describe("given the user is logged in", () => {
+      /* success scenario */
       it("should return a 200 and the users", async () => {
         const jwt = signJwt(userPayload);
 
@@ -89,8 +102,12 @@ describe("user-management", () => {
     });
   });
 
+  /**
+   * Sub test suite 4 - update user
+   */
   describe("update user route", () => {
     describe("given the user is not logged in", () => {
+      /* failure scenario */
       it("should return a 403", async () => {
         const { statusCode } = await supertest(app).put(
           `/api/user-management/${userPayload.userId}`
@@ -101,6 +118,7 @@ describe("user-management", () => {
     });
 
     describe("given the user is logged in", () => {
+      /* success scenario */
       it("should return a 200 and update the user", async () => {
         const jwt = signJwt(userPayload);
 

backend/src/service/deliver.service.ts

@@ -19,6 +19,7 @@ export async function getDeliveryList(
     .populate("order")
     .populate("supplier")
     .populate("site")
+    .sort({ createdAt: -1 })
     .exec();
 }
 

flutter_client/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
-        android:label="flutter_client"
+        android:label="ProcureSync"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

flutter_client/lib/blocs/auth/auth_bloc.dart

@@ -7,14 +7,25 @@ part 'auth_state.dart';
 
 class AuthBloc extends Bloc<AuthEvent, AuthState> {
   AuthBloc() : super(AuthInitial()) {
+    on<GetSiteManagerName>(_getSiteManagerNameEventHandeler);
     on<LoginEvent>(_loginEventHandeler);
     on<SignOut>(_logoutEventHandeler);
   }
 }
 
-void _loginEventHandeler(LoginEvent event, Emitter<AuthState> emit) async {
+void _getSiteManagerNameEventHandeler(
+    GetSiteManagerName event, Emitter<AuthState> emit) async {
+  emit(SigningIn());
+  AuthRepository authRepository = AuthRepository();
+  emit(SiteManagerNameLoading());
+  await authRepository.siteManagerName.then((siteManagerName) {
+    emit(SiteManagerName(siteManagerName));
+  }).catchError((onError) {
+    emit(SiteManagerNameLoadFailed());
+  });
+}
 
-  print("wwwwwwwwwwwwwwwwwwwwwwwwwwwwewewewewewewewe");
+void _loginEventHandeler(LoginEvent event, Emitter<AuthState> emit) async {
   emit(SigningIn());
   AuthRepository authRepository = AuthRepository();
 
@@ -34,7 +45,6 @@ void _logoutEventHandeler(SignOut event, Emitter<AuthState> emit) async {
   AuthRepository authRepository = AuthRepository();
   final isLoggedOut = await authRepository.logout();
   if (isLoggedOut) {
-    // authRepository.isTokenAvailable();
     emit(SignedOut());
     emit(AuthInitial());
   } else {

flutter_client/lib/blocs/auth/auth_event.dart

@@ -5,6 +5,10 @@ abstract class AuthEvent {
   const AuthEvent();
 }
 
+class GetSiteManagerName extends AuthEvent {
+  const GetSiteManagerName();
+}
+
 class LoginEvent extends AuthEvent {
   final String username;
   final String password;

flutter_client/lib/blocs/auth/auth_state.dart

@@ -16,3 +16,13 @@ final class SigningOut extends AuthState {}
 final class SignedOut extends AuthState {}
 
 final class SignOutFailed extends AuthState {}
+
+final class SiteManagerName extends AuthState {
+  final String siteManagerName;
+
+  SiteManagerName(this.siteManagerName);
+}
+
+final class SiteManagerNameLoading extends AuthState {}
+
+final class SiteManagerNameLoadFailed extends AuthState {}

flutter_client/lib/blocs/cart/cart_bloc.dart

@@ -104,6 +104,7 @@ class CartBloc extends Bloc<CartEvent, CartState> {
 
   void _clearCartHandler(ClearCartEvent event, Emitter<CartState> emit) {
     cart.clear();
+    _temporaryProducts.clear();
 
     emit(ProductCartUpdated(orderProducts: cart, cartTotal: 0));
   }

flutter_client/lib/blocs/goodReceipts/goods_receipt_bloc.dart

@@ -12,6 +12,7 @@ class GoodsReceiptBloc extends Bloc<GoodsReceiptEvent, GoodsReceiptState> {
 
   GoodsReceiptBloc() : super(GoodsReceiptInitial()) {
     on<GetGoodsReceiptsEvent>(_getGoodsReceiptsHandler);
+    on<MarkAsReceivedEvent>(_markAsReceivedHandler);
   }
 
   // Load products
@@ -34,4 +35,30 @@ class GoodsReceiptBloc extends Bloc<GoodsReceiptEvent, GoodsReceiptState> {
       },
     );
   }
+
+  // Mark as received
+  void _markAsReceivedHandler(
+      MarkAsReceivedEvent event, Emitter<GoodsReceiptState> emit) async {
+    emit(
+      GoodsReceiptMarkingAsReceived(
+        goodsReceiptNumber: event.goodsReceiptNumber,
+      ),
+    );
+
+    await _goodsReceiptRepository
+        .markedAsReceived(event.goodsReceiptNumber)
+        .then(
+      (goodsReceipt) {
+        emit(GoodsReceiptMarkedAsReceived(
+            goodsReceiptNumber: event.goodsReceiptNumber));
+      },
+    ).catchError(
+      (error) {
+        emit(
+          const GoodsReceiptMarkedAsReceivedError(
+              message: "Error marking goods receipt as received."),
+        );
+      },
+    );
+  }
 }

flutter_client/lib/blocs/goodReceipts/goods_receipt_event.dart

@@ -8,3 +8,8 @@ abstract class GoodsReceiptEvent {
 class GetGoodsReceiptsEvent extends GoodsReceiptEvent {
   const GetGoodsReceiptsEvent();
 }
+
+class MarkAsReceivedEvent extends GoodsReceiptEvent {
+  final String goodsReceiptNumber;
+  const MarkAsReceivedEvent(this.goodsReceiptNumber);
+}