fix(signature-collection): Fix paper signatures for candidacy (#16411)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Oct 16, 2024 · a5d88ae · a5d88ae
1 parent 91c70f8
commit a5d88ae
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/libs/api/domains/signature-collection/src/lib/signatureCollection.service.ts b/libs/api/domains/signature-collection/src/lib/signatureCollection.service.ts
@@ -176,7 +176,8 @@ export class SignatureCollectionService {
     const canSign =
       signatureSignee.canSign ||
       (signatureSignee.canSignInfo?.length === 1 &&
-        signatureSignee.canSignInfo[0] === ReasonKey.AlreadySigned)
+        (signatureSignee.canSignInfo[0] === ReasonKey.AlreadySigned ||
+          signatureSignee.canSignInfo[0] === ReasonKey.noInvalidSignature))
 
     return canSign && list.area.id === signatureSignee.area?.id
   }

diff --git a/libs/clients/signature-collection/src/lib/signature-collection-shared.service.ts b/libs/clients/signature-collection/src/lib/signature-collection-shared.service.ts
@@ -90,9 +90,7 @@ export class SignatureCollectionSharedClientService {
     const signatures = await api.medmaelalistarIDMedmaeliGet({
       iD: parseInt(listId),
     })
-    return signatures
-      .map((signature) => mapSignature(signature))
-      .filter((s) => s.valid)
+    return signatures.map((signature) => mapSignature(signature))
   }
 
   canCreate({

diff --git a/libs/clients/signature-collection/src/lib/signature-collection.service.ts b/libs/clients/signature-collection/src/lib/signature-collection.service.ts
@@ -277,23 +277,29 @@ export class SignatureCollectionClientService {
       pageNumber,
     }: { listId: string; nationalId: string; pageNumber: number },
   ): Promise<Success> {
-    const newSignature = await this.getApiWithAuth(
-      this.listsApi,
-      auth,
-    ).medmaelalistarIDMedmaeliBulkPost({
-      medmaeliBulkRequestDTO: {
-        medmaeli: [
-          {
-            kennitala: nationalId,
-            bladsida: pageNumber,
-          },
-        ],
-      },
-      iD: parseInt(listId),
-    })
+    try {
+      await this.getApiWithAuth(
+        this.listsApi,
+        auth,
+      ).medmaelalistarIDMedmaeliBulkPost({
+        medmaeliBulkRequestDTO: {
+          medmaeli: [
+            {
+              kennitala: nationalId,
+              bladsida: pageNumber,
+            },
+          ],
+        },
+        iD: parseInt(listId),
+      })
 
-    return {
-      success: !!newSignature.medmaeliKenn?.includes(nationalId),
+      return {
+        success: true,
+      }
+    } catch {
+      return {
+        success: false,
+      }
     }
   }
 

diff --git a/...ignature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx b/...ignature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx
@@ -73,7 +73,7 @@ export const PaperSignees = ({
         },
       },
       onCompleted: (res) => {
-        if (res.success) {
+        if (res.signatureCollectionUploadPaperSignature?.success) {
           toast.success(formatMessage(m.paperSigneeSuccess))
           refetchSignees()
         } else {