Merge remote-tracking branch 'origin/main' into content-repo

Author: NJ-Innovation-CI

api/src/api/userRouter.test.ts

@@ -6,6 +6,7 @@ import { getCurrentDate, parseDate } from "@shared/dateHelpers";
 import { getCurrentBusiness } from "@shared/domain-logic/getCurrentBusiness";
 import { modifyCurrentBusiness } from "@shared/domain-logic/modifyCurrentBusiness";
 import { createEmptyFormationFormData, emptyAddressData } from "@shared/formationData";
+import { randomInt } from "@shared/intHelpers";
 import { LicenseName } from "@shared/license";
 import {
   generateBusiness,
@@ -593,6 +594,51 @@ describe("userRouter", () => {
       });
 
       describe("when businessPersona is 'STARTING'", () => {
+        it("checks name availability using name from formationFormData", async () => {
+          const userData = generateUserDataForBusiness(
+            generateBusiness({
+              profileData: generateStartingProfileData({
+                businessName: "Business Name in Profile",
+              }),
+              formationData: generateFormationData({
+                businessNameAvailability: generateBusinessNameAvailability({
+                  status: "AVAILABLE",
+                  lastUpdatedTimeStamp: sixtyOneMinutesAgo,
+                }),
+                formationFormData: generateFormationFormData({
+                  businessName: "Business Name in Formation Form Data",
+                }),
+              }),
+            }),
+          );
+          stubUnifiedDataClient.get.mockResolvedValue(userData);
+
+          await request(app).get(`/users/123`).set("Authorization", "Bearer user-123-token");
+          expect(stubTimeStampBusinessSearch.search).toHaveBeenCalledWith(
+            "Business Name in Formation Form Data",
+          );
+        });
+
+        it("does not check name availability if formationFormData.businessName is an empty string", async () => {
+          const userData = generateUserDataForBusiness(
+            generateBusiness({
+              formationData: generateFormationData({
+                businessNameAvailability: generateBusinessNameAvailability({
+                  status: "AVAILABLE",
+                  lastUpdatedTimeStamp: sixtyOneMinutesAgo,
+                }),
+                formationFormData: generateFormationFormData({
+                  businessName: "",
+                }),
+              }),
+            }),
+          );
+          stubUnifiedDataClient.get.mockResolvedValue(userData);
+
+          await request(app).get(`/users/123`).set("Authorization", "Bearer user-123-token");
+          expect(stubTimeStampBusinessSearch.search).not.toHaveBeenCalled();
+        });
+
         it("does not update business name search if businessNameAvailability is undefined", async () => {
           const userData = generateUserDataForBusiness(
             generateBusiness({
@@ -733,13 +779,38 @@ describe("userRouter", () => {
 
           await request(app).get(`/users/123`).set("Authorization", "Bearer user-123-token");
           expect(stubTimeStampBusinessSearch.search).toHaveBeenCalledWith(
-            getCurrentBusiness(userData).profileData.businessName,
+            getCurrentBusiness(userData).formationData.formationFormData.businessName,
           );
           expect(stubUpdateOperatingPhase).toHaveBeenCalledWith(userData);
         });
       });
 
       describe("when businessPersona is 'FOREIGN' and Foreign type is Nexus", () => {
+        it("does not seach when nexusDbaName is an empty string", async () => {
+          const userData = generateUserDataForBusiness(
+            generateBusiness({
+              profileData: generateProfileData({
+                businessPersona: "FOREIGN",
+                foreignBusinessTypeIds: ["employeeOrContractorInNJ"],
+              }),
+              formationData: generateFormationData({
+                completedFilingPayment: false,
+                businessNameAvailability: generateBusinessNameAvailability({
+                  status: "UNAVAILABLE",
+                }),
+                dbaBusinessNameAvailability: generateBusinessNameAvailability({
+                  status: "AVAILABLE",
+                  lastUpdatedTimeStamp: sixtyOneMinutesAgo,
+                }),
+              }),
+            }),
+          );
+          stubUnifiedDataClient.get.mockResolvedValue(userData);
+
+          await request(app).get(`/users/123`).set("Authorization", "Bearer user-123-token");
+          expect(stubTimeStampBusinessSearch.search).not.toHaveBeenCalled();
+        });
+
         it("does not recheck business name availability if businessNameAvailability and dbaBusinessNameAvailability are undefined", async () => {
           const userData = generateUserDataForBusiness(
             generateBusiness({
@@ -904,6 +975,7 @@ describe("userRouter", () => {
           const userData = generateUserDataForBusiness(
             generateBusiness({
               profileData: generateProfileData({
+                nexusDbaName: `some-dbaName-${randomInt()}`,
                 businessPersona: "FOREIGN",
                 foreignBusinessTypeIds: ["employeeOrContractorInNJ"],
               }),

api/src/api/userRouter.ts

@@ -418,7 +418,14 @@ export const userRouterFactory = (
       const needsDba = determineIfNexusDbaNameNeeded(currentBusiness);
       const nameToSearch = needsDba
         ? currentBusiness.profileData.nexusDbaName
-        : currentBusiness.profileData.businessName;
+        : currentBusiness.formationData.formationFormData.businessName;
+
+      if (nameToSearch === "") {
+        logger.LogInfo("Skipping name availability search - no name entered yet");
+        return userData;
+      }
+      logger.LogInfo(`Executing name availability search for ${nameToSearch}`);
+
       const response = await timeStampBusinessSearch.search(nameToSearch);
 
       const nameAvailability: NameAvailability = {

api/src/libs/logWriter.ts

@@ -29,7 +29,8 @@ export const DummyLogWriter: LogWriterType = {
 export const ConsoleLogWriter: LogWriterType = {
   LogError: async (message: string, details?: AxiosError): Promise<void> => {
     try {
-      console.error(`${message} - ${JSON.stringify(details?.toJSON())}`);
+      const jsonDetails = typeof details?.toJSON === "function" ? details.toJSON() : details;
+      console.error(`${message} - ${JSON.stringify(jsonDetails)}`);
     } catch (error) {
       console.error(`Error with LogError:${error}`);
     }

content/src/roadmaps/industries/auto-body-repair.json

@@ -54,6 +54,12 @@
       "task": "community-right-to-know-survey",
       "required": true
     },
+    {
+      "step": 4,
+      "weight": 62,
+      "task": "env-permitting",
+      "required": false
+    },
     {
       "step": 4,
       "task": "resale-tax-certificate-operating",

content/src/roadmaps/industries/cannabis.json

@@ -78,6 +78,12 @@
       "step": 4,
       "weight": 99,
       "task": "manage-business-vehicles"
+    },
+    {
+      "step": 4,
+      "weight": 36,
+      "task": "env-permitting",
+      "required": false
     }
   ],
   "name": "Cannabis",
@@ -100,4 +106,4 @@
   "id": "cannabis",
   "description": "A business that manufactures, delivers, or sells cannabis",
   "webflowId": "656a1362657b7f011c19dc79"
-}
+}

content/src/roadmaps/industries/commercial-construction.json

@@ -37,6 +37,12 @@
       "weight": 10,
       "task": "bank-account"
     },
+    {
+      "step": 4,
+      "weight": 11,
+      "task": "env-permitting",
+      "required": false
+    },
     {
       "step": 4,
       "weight": 99,

content/src/roadmaps/industries/cosmetology.json

@@ -59,6 +59,12 @@
       "weight": 17,
       "task": "resale-tax-certificate-operating"
     },
+    {
+      "step": 4,
+      "weight": 18,
+      "task": "env-permitting",
+      "required": false
+    },
     {
       "step": 4,
       "weight": 99,

content/src/roadmaps/industries/daycare.json

@@ -42,6 +42,12 @@
       "weight": 15,
       "task": "get-insurance"
     },
+    {
+      "step": 4,
+      "weight": 16,
+      "task": "env-permitting",
+      "required": false
+    },
     {
       "step": 4,
       "weight": 99,

content/src/roadmaps/industries/funeral.json

@@ -54,6 +54,12 @@
       "licenseTask": "mortuary-practitioner",
       "required": false
     },
+    {
+      "step": 4,
+      "weight": 26,
+      "task": "env-permitting",
+      "required": false
+    },
     {
       "step": 4,
       "licenseTask": "rmw-generator-registration",

content/src/roadmaps/industries/health-club.json

@@ -47,6 +47,12 @@
       "weight": 15,
       "licenseTask": "health-club-registration"
     },
+    {
+      "step": 4,
+      "weight": 16,
+      "task": "env-permitting",
+      "required": false
+    },
     {
       "step": 4,
       "weight": 99,