OBPIH-7952 Cycle Count - perform cc for item

.env.example

@@ -19,6 +19,7 @@ LOCATION_NO_PICK_AND_PUTAWAY_STOCK_DEPOT=locationId
 LOCATION_INTERNAL=locationId
 LOCATION_INTERNAL_TWO=locationId
 LOCATION_WARD=locationId
+LOCATION_CC_DEPOT=locationId
 PRODUCT_ONE=productId
 PRODUCT_TWO=productId
 PRODUCT_THREE=productId

.github/workflows/playwright.yml

@@ -79,6 +79,7 @@ jobs:
         LOCATION_NO_PICK_AND_PUTAWAY_STOCK_DEPOT: ${{ secrets.LOCATION_NO_PICK_AND_PUTAWAY_STOCK_DEPOT }}
         LOCATION_INTERNAL: ${{ secrets.LOCATION_INTERNAL }}
         LOCATION_INTERNAL_TWO: ${{ secrets.LOCATION_INTERNAL_TWO }}
+        LOCATION_CC_DEPOT: ${{ secrets.LOCATION_CC_DEPOT }}
         PRODUCT_ONE: ${{ secrets.PRODUCT_ONE }}
         PRODUCT_TWO: ${{ secrets.PRODUCT_TWO }}
         PRODUCT_THREE: ${{ secrets.PRODUCT_THREE }}

playwright.config.ts

@@ -25,8 +25,10 @@ export default defineConfig({
   forbidOnly: !!appConfig.isCI,
   /* Retry on CI only */
   retries: appConfig.isCI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: 1,
+  /* Total worker pool. Each project below caps itself at 1 worker,
+   * so this just lets the cycleCount project run on its own worker
+   * alongside the rest of the suite instead of queuing behind it. */
+  workers: 2,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: 'html',
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
@@ -57,6 +59,12 @@ export default defineConfig({
       testDir: './src/setup',
       dependencies: ['validate-data-setup'],
     },
+    {
+      name: 'auth-setup-cycleCount',
+      testMatch: 'authCycleCount.setup.ts',
+      testDir: './src/setup',
+      dependencies: ['auth-setup'],
+    },
     {
       name: 'create-data-setup',
       testMatch: 'createData.setup.ts',
@@ -86,6 +94,8 @@ export default defineConfig({
     },
     {
       name: 'chromium',
+      testIgnore: '**/cycleCount/**',
+      workers: 1,
       use: {
         ...devices['Desktop Chrome'],
         viewport: { width: 1366, height: 768 },
@@ -98,5 +108,21 @@ export default defineConfig({
         'validate-clean-state',
       ],
     },
+    {
+      name: 'chromium-cycleCount',
+      testDir: './src/tests/cycleCount',
+      workers: 1,
+      use: {
+        ...devices['Desktop Chrome'],
+        viewport: { width: 1366, height: 768 },
+        storageState: appConfig.users['main'].ccStoragePath,
+      },
+      dependencies: [
+        'auth-setup-cycleCount',
+        'create-data-setup',
+        'data-import-setup',
+        'validate-clean-state',
+      ],
+    },
   ],
 });

src/api/LocationService.ts

@@ -5,6 +5,7 @@ import {
   LOCATION_BY_ID,
   LOCATION_TYPES,
 } from '@/constants/apiUrls';
+import { LocationTypeCode } from '@/constants/LocationTypeCode';
 import {
   ApiResponse,
   CreateLocationPayload,
@@ -88,6 +89,40 @@ class LocationService extends BaseServiceModel {
       throw new Error('Problem fetching location types');
     }
   }
+
+  /**
+    Returns the id of the bin location with the given name under the given
+    parent location, creating it first if it doesn't exist yet.
+  */
+  async getOrCreateBinLocation(
+    name: string,
+    parentLocationId: string
+  ): Promise<string> {
+    const { data: existingLocations } = await this.searchInternalLocations(
+      name,
+      parentLocationId
+    );
+    const existingLocation = existingLocations.find(
+      (location) => location.name === name
+    );
+    if (existingLocation) {
+      return existingLocation.id;
+    }
+
+    const { data: locationTypes } = await this.getLocationTypes();
+    const binLocationType = locationTypes.find(
+      (locationType) =>
+        locationType.locationTypeCode === LocationTypeCode.BIN_LOCATION
+    );
+
+    const { data: createdLocation } = await this.createLocation({
+      active: true,
+      name,
+      locationType: binLocationType,
+      parentLocation: { id: parentLocationId },
+    });
+    return createdLocation.id;
+  }
 }
 
 export default LocationService;

src/components/Navbar.ts

@@ -34,6 +34,12 @@ class Navbar extends BasePageModel {
       .filter({ visible: true });
   }
 
+  getSectionNavItem(sectionName: string, itemName: string) {
+    return this.getSectionTitle(sectionName)
+      .locator('..')
+      .getByRole('menuitem', { name: itemName, exact: true });
+  }
+
   get editProfileButton() {
     return this.navbar.getByRole('menuitem', { name: 'Edit Profile' });
   }

src/config/AppConfig.ts

@@ -29,6 +29,7 @@ export enum LOCATION_KEY {
   NO_PICK_AND_PUTAWAY_STOCK = 'noPickAndPutawayStockDepot',
   BIN_LOCATION = 'internalLocation',
   BIN_LOCATION2 = 'internalLocation2',
+  CC_DEPOT = 'ccDepot',
 }
 
 export enum PRODUCT_KEY {
@@ -71,6 +72,11 @@ class AppConfig {
     '/inventory.csv'
   );
 
+  public static CYCLE_COUNT_INVENTORY_IMPORT_FILE_PATH = path.join(
+    AppConfig.DATA_IMPORT_DIRECTORY_PATH,
+    '/cycleCountInventory.csv'
+  );
+
   // Base URL to use in actions like `await page.goto('./dashboard')`.
   public appURL!: string;
 
@@ -309,6 +315,27 @@ class AppConfig {
         type: LocationTypeCode.BIN_LOCATION,
         parentLocation: env.get('LOCATION_MAIN').required().asString(),
       }),
+      ccDepot: new LocationConfig({
+        key: LOCATION_KEY.CC_DEPOT,
+        id: env.get('LOCATION_CC_DEPOT').required().asString(),
+        requiredActivityCodes: new Set([
+          ActivityCode.MANAGE_INVENTORY,
+          ActivityCode.SUBMIT_REQUEST,
+          ActivityCode.SEND_STOCK,
+          ActivityCode.PLACE_REQUEST,
+          ActivityCode.PLACE_ORDER,
+          ActivityCode.FULFILL_REQUEST,
+          ActivityCode.EXTERNAL,
+          ActivityCode.RECEIVE_STOCK,
+          ActivityCode.PARTIAL_RECEIVING,
+          ActivityCode.PICK_STOCK,
+          ActivityCode.PUTAWAY_STOCK,
+          ActivityCode.CONSUME_STOCK,
+          ActivityCode.ADJUST_INVENTORY,
+        ]),
+        type: LocationTypeCode.DEPOT,
+        required: true,
+      }),
     };
 
     // Fulfill products data in app config dynamically based on the products.csv

src/config/TestUserConfig.ts

@@ -12,6 +12,7 @@ class TestUserConfig {
   username: string;
   password: string;
   storagePath: string;
+  ccStoragePath: string;
   requiredRoles: Set<RoleType>;
 
   constructor({
@@ -35,6 +36,10 @@ class TestUserConfig {
       AppConfig.AUTH_STORAGE_DIR_PATH,
       storageFileName
     );
+    this.ccStoragePath = path.join(
+      AppConfig.AUTH_STORAGE_DIR_PATH,
+      storageFileName.replace('.json', '-CC.json')
+    );
     this.requiredRoles = requiredRoles;
   }
 

src/constants/applicationUrls.ts

@@ -39,6 +39,10 @@ const INVENTORY_URL = {
     `${INVENTORY_URL.base}/deleteTransaction/${id}`,
 };
 
+const CYCLE_COUNT_URL = {
+  base: './inventory/cycleCount',
+};
+
 const INVENTORY_ITEM_URL = {
   base: './inventoryItem',
   showStockCard: (id: string) => `${INVENTORY_ITEM_URL.base}/showStockCard/${id}`,
@@ -91,6 +95,7 @@ const ORDER_URL = {
 
 export {
   AUTH_URL,
+  CYCLE_COUNT_URL,
   DASHBOARD_URL,
   INVENTORY_ITEM_URL,
   INVENTORY_URL,

src/fixtures/fixtures.ts

@@ -21,6 +21,11 @@ import CreateLocationGroupPage from '@/pages/locationGroup/CreateLocationGroupPa
 import EditLocationGroupPage from '@/pages/locationGroup/EditLocationGroupPage';
 import LocationGroupsListPage from '@/pages/locationGroup/LocationGroupsListPage';
 import LoginPage from '@/pages/LoginPage';
+import ConfirmToCountStepPage from '@/pages/manageCycleCount/ConfirmToCountStepPage';
+import ConfirmToRecountStepPage from '@/pages/manageCycleCount/ConfirmToRecountStepPage';
+import CountStepPage from '@/pages/manageCycleCount/CountStepPage';
+import ManageCycleCountPage from '@/pages/manageCycleCount/ManageCycleCountPage';
+import RecountStepPage from '@/pages/manageCycleCount/RecountStepPage';
 import CreateOrganizationPage from '@/pages/oranization/CreateOrganizationPage';
 import EditOrganizationPage from '@/pages/oranization/EditOrganizationPage';
 import OrganizationListPage from '@/pages/oranization/OrganizationListPage';
@@ -77,6 +82,11 @@ type Fixtures = {
   productEditPage: ProductEditPage;
   editTransactionPage: EditTransactionPage;
   addCommentToPutawayPage: AddCommentToPutawayPage;
+  manageCycleCountPage: ManageCycleCountPage;
+  countStepPage: CountStepPage;
+  confirmToCountStepPage: ConfirmToCountStepPage;
+  recountStepPage: RecountStepPage;
+  confirmToRecountStepPage: ConfirmToRecountStepPage;
   // COMPONENTS
   navbar: Navbar;
   locationChooser: LocationChooser;
@@ -99,6 +109,7 @@ type Fixtures = {
   noPickAndPutawayStockDepotService: LocationData;
   internalLocationService: LocationData;
   internalLocation2Service: LocationData;
+  ccDepotService: LocationData;
 
   // PRODUCT DATA
   productService: ProductData;
@@ -159,6 +170,14 @@ export const test = baseTest.extend<Fixtures>({
     use(new EditTransactionPage(page)),
   addCommentToPutawayPage: async ({ page }, use) =>
     use(new AddCommentToPutawayPage(page)),
+  manageCycleCountPage: async ({ page }, use) =>
+    use(new ManageCycleCountPage(page)),
+  countStepPage: async ({ page }, use) => use(new CountStepPage(page)),
+  confirmToCountStepPage: async ({ page }, use) =>
+    use(new ConfirmToCountStepPage(page)),
+  recountStepPage: async ({ page }, use) => use(new RecountStepPage(page)),
+  confirmToRecountStepPage: async ({ page }, use) =>
+    use(new ConfirmToRecountStepPage(page)),
   // COMPONENTS
   navbar: async ({ page }, use) => use(new Navbar(page)),
   locationChooser: async ({ page }, use) => use(new LocationChooser(page)),
@@ -196,6 +215,8 @@ export const test = baseTest.extend<Fixtures>({
     use(new LocationData(LOCATION_KEY.BIN_LOCATION, page.request)),
   internalLocation2Service: async ({ page }, use) =>
     use(new LocationData(LOCATION_KEY.BIN_LOCATION2, page.request)),
+  ccDepotService: async ({ page }, use) =>
+    use(new LocationData(LOCATION_KEY.CC_DEPOT, page.request)),
   // PRODUCTS
   productService: async ({ page }, use) => use(new ProductData(page.request)),
   // USERS

src/pages/manageCycleCount/ConfirmToCountStepPage.ts

@@ -0,0 +1,49 @@
+import { expect, Page } from '@playwright/test';
+
+import BasePageModel from '@/pages/BasePageModel';
+import AssignToRecountDialog from '@/pages/manageCycleCount/components/AssignToRecountDialog';
+import ConfirmToCountTable from '@/pages/manageCycleCount/components/ConfirmToCountTable';
+import ResolveDiscrepancyDialog from '@/pages/manageCycleCount/components/ResolveDiscrepancyDialog';
+
+class ConfirmToCountStepPage extends BasePageModel {
+  confirmToCountTable: ConfirmToCountTable;
+  resolveDiscrepancyDialog: ResolveDiscrepancyDialog;
+  assignToRecountDialog: AssignToRecountDialog;
+
+  constructor(page: Page) {
+    super(page);
+    this.confirmToCountTable = new ConfirmToCountTable(page);
+    this.resolveDiscrepancyDialog = new ResolveDiscrepancyDialog(page);
+    this.assignToRecountDialog = new AssignToRecountDialog(page);
+  }
+
+  async isLoaded() {
+    await expect(this.saveButton).toBeVisible();
+  }
+
+  get productTitle() {
+    return this.page.locator('.count-step-title');
+  }
+
+  get dateCountedValue() {
+    return this.page
+      .locator('.count-step-label', { hasText: 'Date counted' })
+      .locator('.count-step-value');
+  }
+
+  get countedByValue() {
+    return this.page
+      .locator('.count-step-label', { hasText: 'Counted by' })
+      .locator('.count-step-value');
+  }
+
+  get backButton() {
+    return this.page.getByRole('button', { name: 'Back', exact: true });
+  }
+
+  get saveButton() {
+    return this.page.getByRole('button', { name: 'Save', exact: true });
+  }
+}
+
+export default ConfirmToCountStepPage;

src/pages/manageCycleCount/ConfirmToRecountStepPage.ts

@@ -0,0 +1,55 @@
+import { expect, Page } from '@playwright/test';
+
+import BasePageModel from '@/pages/BasePageModel';
+import ConfirmToRecountTable from '@/pages/manageCycleCount/components/ConfirmToRecountTable';
+
+class ConfirmToRecountStepPage extends BasePageModel {
+  confirmToRecountTable: ConfirmToRecountTable;
+
+  constructor(page: Page) {
+    super(page);
+    this.confirmToRecountTable = new ConfirmToRecountTable(page);
+  }
+
+  async isLoaded() {
+    await expect(this.saveButton).toBeVisible();
+  }
+
+  get productTitle() {
+    return this.page.locator('.count-step-title');
+  }
+
+  get dateCountedValue() {
+    return this.page
+      .locator('.count-step-label', { hasText: 'Date counted' })
+      .locator('.count-step-value');
+  }
+
+  get countedByValue() {
+    return this.page
+      .locator('.count-step-label', { hasText: /^Counted by/ })
+      .locator('.count-step-value');
+  }
+
+  get dateRecountedValue() {
+    return this.page
+      .locator('.count-step-label', { hasText: 'Date recounted' })
+      .locator('.count-step-value');
+  }
+
+  get recountedByValue() {
+    return this.page
+      .locator('.count-step-label', { hasText: 'Recounted by' })
+      .locator('.count-step-value');
+  }
+
+  get backButton() {
+    return this.page.getByRole('button', { name: 'Back', exact: true });
+  }
+
+  get saveButton() {
+    return this.page.getByRole('button', { name: 'Save', exact: true });
+  }
+}
+
+export default ConfirmToRecountStepPage;