Tweaks for parliamentary signature collection

libs/api/domains/signature-collection/src/lib/dto/canSign.input.ts → libs/api/domains/signature-collection/src/lib/dto/canSignFromPaper.input.ts

@@ -2,8 +2,11 @@ import { IsString } from 'class-validator'
 import { Field, InputType } from '@nestjs/graphql'
 
 @InputType()
-export class SignatureCollectionCanSignInput {
+export class SignatureCollectionCanSignFromPaperInput {
   @Field()
   @IsString()
   signeeNationalId!: string
+  @Field()
+  @IsString()
+  listId!: string
 }

libs/api/domains/signature-collection/src/lib/signatureCollection.resolver.ts

@@ -30,7 +30,7 @@ import { CurrentSignee } from './decorators/signee.decorator'
 import { ApiScope } from '@island.is/auth/scopes'
 import { SignatureCollectionCancelListsInput } from './dto/cencelLists.input'
 import { SignatureCollectionIdInput } from './dto/collectionId.input'
-import { SignatureCollectionCanSignInput } from './dto/canSign.input'
+import { SignatureCollectionCanSignFromPaperInput } from './dto/canSignFromPaper.input'
 import { SignatureCollectionAddListsInput } from './dto/addLists.input'
 import { SignatureCollectionListBulkUploadInput } from './dto/bulkUpload.input'
 import { SignatureCollectionUploadPaperSignatureInput } from './dto/uploadPaperSignature.input'
@@ -133,13 +133,11 @@ export class SignatureCollectionResolver {
   @Query(() => Boolean)
   @AccessRequirement(OwnerAccess.AllowActor)
   @Audit()
-  async signatureCollectionCanSign(
-    @Args('input') input: SignatureCollectionCanSignInput,
+  async signatureCollectionCanSignFromPaper(
+    @Args('input') input: SignatureCollectionCanSignFromPaperInput,
     @CurrentUser() user: User,
   ): Promise<boolean> {
-    return (
-      await this.signatureCollectionService.signee(user, input.signeeNationalId)
-    ).canSign
+    return await this.signatureCollectionService.canSignFromPaper(user, input)
   }
 
   @Scopes(ApiScope.signatureCollection)

libs/api/domains/signature-collection/src/lib/signatureCollection.service.ts

@@ -18,6 +18,7 @@ import { SignatureCollectionAddListsInput } from './dto/addLists.input'
 import { SignatureCollectionOwnerInput } from './dto/owner.input'
 import { SignatureCollectionListBulkUploadInput } from './dto/bulkUpload.input'
 import { SignatureCollectionUploadPaperSignatureInput } from './dto/uploadPaperSignature.input'
+import { SignatureCollectionCanSignFromPaperInput } from './dto/canSignFromPaper.input'
 
 @Injectable()
 export class SignatureCollectionService {
@@ -142,4 +143,13 @@ export class SignatureCollectionService {
       input,
     )
   }
+
+  async canSignFromPaper(
+    user: User,
+    input: SignatureCollectionCanSignFromPaperInput,
+  ): Promise<boolean> {
+    const signee = await this.signee(user, input.signeeNationalId)
+    const list = await this.list(input.listId, user)
+    return signee.canSign && list.area.id === signee.area?.id
+  }
 }

libs/api/domains/signature-collection/src/lib/signatureCollectionAdmin.resolver.ts

@@ -31,7 +31,7 @@ import { SignatureCollectionNationalIdInput } from './dto/nationalId.input'
 import { SignatureCollectionSignatureIdInput } from './dto/signatureId.input'
 import { SignatureCollectionIdInput } from './dto/collectionId.input'
 import { SignatureCollectionCandidateIdInput } from './dto/candidateId.input'
-import { SignatureCollectionCanSignInput } from './dto/canSign.input'
+import { SignatureCollectionCanSignFromPaperInput } from './dto/canSignFromPaper.input'
 import { ReasonKey } from '@island.is/clients/signature-collection'
 import { CanSignInfo } from './models/canSignInfo.model'
 
@@ -53,7 +53,7 @@ export class SignatureCollectionAdminResolver {
   async signatureCollectionAdminCanSignInfo(
     @CurrentUser()
     user: User,
-    @Args('input') input: SignatureCollectionCanSignInput,
+    @Args('input') input: SignatureCollectionCanSignFromPaperInput,
   ): Promise<CanSignInfo> {
     const canSignInfo = await this.signatureCollectionService.getCanSignInfo(
       user,

libs/clients/signature-collection/src/lib/signature-collection.service.ts

@@ -377,11 +377,7 @@ export class SignatureCollectionClientService {
           isDigital: signature.isDigital,
           pageNumber: signature.pageNumber,
           isValid: signature.valid,
-          canUnsign:
-            signature.isDigital &&
-            signature.valid &&
-            list.active &&
-            signedThisPeriod,
+          canUnsign: signature.valid && list.active && signedThisPeriod,
           ...list,
         } as SignedList
       }),

libs/service-portal/signature-collection/src/hooks/graphql/queries.ts

@@ -159,7 +159,7 @@ export const GetCurrentCollection = gql`
 `
 
 export const GetCanSign = gql`
-  query Query($input: SignatureCollectionCanSignInput!) {
-    signatureCollectionCanSign(input: $input)
+  query Query($input: SignatureCollectionCanSignFromPaperInput!) {
+    signatureCollectionCanSignFromPaper(input: $input)
   }
 `

libs/service-portal/signature-collection/src/hooks/index.ts

@@ -149,18 +149,23 @@ export const useGetCurrentCollection = () => {
   }
 }
 
-export const useGetCanSign = (signeeId: string, isValidId: boolean) => {
+export const useGetCanSign = (
+  signeeId: string,
+  listId: string,
+  isValidId: boolean,
+) => {
   const { data: getCanSignData, loading: loadingCanSign } = useQuery(
     GetCanSign,
     {
       variables: {
         input: {
           signeeNationalId: signeeId,
+          listId: listId,
         },
       },
       skip: !signeeId || signeeId.length !== 10 || !isValidId,
     },
   )
-  const canSign = getCanSignData?.signatureCollectionCanSign ?? false
+  const canSign = getCanSignData?.signatureCollectionCanSignFromPaper ?? false
   return { canSign, loadingCanSign }
 }

libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx

@@ -44,6 +44,7 @@ export const PaperSignees = ({
   })
   const { canSign, loadingCanSign } = useGetCanSign(
     nationalIdInput,
+    listId,
     nationalId.isValid(nationalIdInput),
   )