Merge pull request #152 from bcgov/uspa-changes-2024/SOW25N003-7-

SOW25N003-7 Exceeding Caps - Draft vs Error
bcgov · Dec 16, 2024 · 3049dd7 · 3049dd7
2 parents f62918d + 23e277d
commit 3049dd7
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/Modules/Institution/App/Http/Requests/AttestationDuplicateRequest.php b/Modules/Institution/App/Http/Requests/AttestationDuplicateRequest.php
@@ -142,7 +142,16 @@ private function getFedGuid(Cap $cap)
             $next_numeric_part = 100000000;
         }
 
-        // Construct the next value
-        return 'BC'.$year_prefix.'-'.sprintf('%03d', $next_numeric_part);
+        // Loop to ensure uniqueness
+        do {
+            $fed_guid = 'BC' . $year_prefix . '-' . sprintf('%09d', $next_numeric_part);
+            $exists = Attestation::where('fed_guid', $fed_guid)->exists();
+
+            if ($exists) {
+                $next_numeric_part++;
+            }
+        } while ($exists);
+
+        return $fed_guid;
     }
 }
diff --git a/Modules/Institution/App/Http/Requests/AttestationStoreRequest.php b/Modules/Institution/App/Http/Requests/AttestationStoreRequest.php
@@ -162,7 +162,16 @@ private function getFedGuid(Cap $cap)
             $next_numeric_part = 100000000;
         }
 
-        // Construct the next value
-        return 'BC'.$year_prefix.'-'.sprintf('%03d', $next_numeric_part);
+        // Loop to ensure uniqueness
+        do {
+            $fed_guid = 'BC' . $year_prefix . '-' . sprintf('%09d', $next_numeric_part);
+            $exists = Attestation::where('fed_guid', $fed_guid)->exists();
+
+            if ($exists) {
+                $next_numeric_part++;
+            }
+        } while ($exists);
+
+        return $fed_guid;
     }
 }
diff --git a/app/Http/Requests/AttestationStoreRequest.php b/app/Http/Requests/AttestationStoreRequest.php
@@ -150,7 +150,16 @@ private function getFedGuid(Cap $cap)
             $next_numeric_part = 100000000;
         }
 
-        // Construct the next value
-        return 'BC'.$year_prefix.'-'.sprintf('%03d', $next_numeric_part);
+        // Loop to ensure uniqueness
+        do {
+            $fed_guid = 'BC' . $year_prefix . '-' . sprintf('%09d', $next_numeric_part);
+            $exists = Attestation::where('fed_guid', $fed_guid)->exists();
+
+            if ($exists) {
+                $next_numeric_part++;
+            }
+        } while ($exists);
+
+        return $fed_guid;
     }
 }