23332 - Enable request restoration NR for a limited restored company (b…

…cgov#786) * Added check for limited restoration * Added condition to use exact look up (BusinessFetch) component for restoration NRs
meawong · Jan 3, 2025 · 76a2a77 · 76a2a77
1 parent 5156bbf
commit 76a2a77
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 19 deletions.
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.5.14",
+  "version": "5.5.15",
   "private": true,
   "appName": "Name Request UI",
   "sbcName": "SBC Common Components",

diff --git a/app/src/components/new-request/business-fetch.vue b/app/src/components/new-request/business-fetch.vue
@@ -83,20 +83,22 @@ export default class BusinessFetch extends Vue {
     const valid = this.validate()
     if (!valid) return
 
-    // perform search
-    this.state = States.SEARCHING
-    this.searchField = this.searchField.replace(' ', '').toUpperCase()
-    const result = await this.searchBusiness(this.searchField).catch(() => {})
+    try {
+      // perform search
+      this.state = States.SEARCHING
+      this.searchField = this.searchField.replace(' ', '').toUpperCase()
+      const result = await this.searchBusiness(this.searchField)
 
-    // return result
-    if (result) {
-      this.state = States.SUMMARY
-      return result
+      // return result
+      if (result) {
+        this.state = States.SUMMARY
+        return result
+      }
+    } catch (error) {
+      // show actual error message
+      this.state = States.INITIAL
+      this.errorMessages = [(error as Error).message || 'Business not found']
     }
-
-    // show error
-    this.state = States.INITIAL
-    this.errorMessages = ['Business not found']
   }
 }
 </script>
diff --git a/app/src/components/new-request/search-components/business-lookup-fetch.vue b/app/src/components/new-request/search-components/business-lookup-fetch.vue
@@ -5,15 +5,21 @@
     :md="md"
   >
     <template v-if="!getSearchBusiness">
-      <BusinessLookup
-        v-if="isAuthenticated"
-        :searchStatus="lookupActiveOrHistorical"
-        @business="onBusiness($event)"
-      />
       <BusinessFetch
-        v-else
+        v-if="isRestoration"
         @business="onBusiness($event)"
       />
+      <template v-else>
+        <BusinessLookup
+          v-if="isAuthenticated"
+          :searchStatus="lookupActiveOrHistorical"
+          @business="onBusiness($event)"
+        />
+        <BusinessFetch
+          v-else
+          @business="onBusiness($event)"
+        />
+      </template>
     </template>
     <v-form
       v-else

diff --git a/app/src/store/actions.ts b/app/src/store/actions.ts
@@ -306,6 +306,15 @@ export async function searchBusiness ({ getters }, corpNum: string): Promise<Bus
   try {
     // first try to find business in Entities (Legal API)
     const data = await NamexServices.searchEntities(corpNum)
+    // for restoration requests, verify business eligibility
+    if (getters.isRestoration) {
+      // check if business is eligible for restoration by verifying restorationExpiryDate exists and not expired
+      if (!data.restorationExpiryDate ||
+        getters.getCurrentJsDate.toISOString().slice(0, 10) > data.restorationExpiryDate) {
+        throw new Error('This business is not eligible for restoration name request')
+      }
+    }
+
     return {
       identifier: data.identifier,
       legalName: data.legalName,