fix: forward record with proper history (#9656)

* fix: forward record with proper history

When indexing the validated record, the DECLARATION_UPDATED
history entry wasn't being forwarded, which was causing conflicting
assignments to be found during indexing and unassign.

* docs: update CHANGELOG

* test: return validated record from records endpoint

Author: Zangetsu101

CHANGELOG.md

@@ -16,6 +16,7 @@
 - Fix a child's NID form field cannot be added eithe rmanually or via ESignet. A father section cannot be placed before a mother section if you wish to use a radio button to control mapping addresses from one individual to aother to make data entry easier [#9582](https://github.com/opencrvs/opencrvs-core/issues/9582)
 - Fix the role of the certifier unable to get resolved for new users which in turn caused the download of the declaration to fail [#9643](https://github.com/opencrvs/opencrvs-core/issues/9643)
 - Fix one failing unassign blocking all other unassign actions from continuing [#9651](https://github.com/opencrvs/opencrvs-core/issues/9651)
+- Fix record not getting unassigned when validating an already validated record again [#9648](https://github.com/opencrvs/opencrvs-core/issues/9648)
 
 ## [1.7.1](https://github.com/opencrvs/opencrvs-core/compare/v1.7.0...v1.7.1)
 

packages/workflow/src/records/handler/validate.test.ts

@@ -22,6 +22,7 @@ import {
   ValidRecord
 } from '@opencrvs/commons/types'
 import { SCOPES } from '@opencrvs/commons/authentication'
+import { VALIDATED_BIRTH_RECORD } from '@test/mocks/records/validated'
 
 describe('Validate record endpoint', () => {
   let server: Awaited<ReturnType<typeof createServer>>
@@ -46,12 +47,18 @@ describe('Validate record endpoint', () => {
       }
     )
 
+    let calledOnce = false
+
     // Gets record by id via getRecordById endpoint
     mswServer.use(
       rest.get(
         'http://localhost:9090/records/7c3af302-08c9-41af-8701-92de9a71a3e4',
         (_, res, ctx) => {
-          return res(ctx.json(READY_FOR_REVIEW_BIRTH_RECORD))
+          if (!calledOnce) {
+            calledOnce = true
+            return res(ctx.json(READY_FOR_REVIEW_BIRTH_RECORD))
+          }
+          return res(ctx.json(VALIDATED_BIRTH_RECORD))
         }
       )
     )

packages/workflow/src/records/handler/validate.ts

@@ -16,6 +16,7 @@ import { auditEvent } from '@workflow/records/audit'
 import { validateRequest } from '@workflow/utils/index'
 import * as z from 'zod'
 import { SCOPES } from '@opencrvs/commons/authentication'
+import { getRecordById } from '@workflow/records'
 
 export const validateRoute = createRoute({
   method: 'POST',
@@ -34,11 +35,12 @@ export const validateRoute = createRoute({
       request.payload
     )
 
-    const validatedRecord = await toValidated(
-      record,
-      token,
-      payload.comments,
-      payload.timeLoggedMS
+    await toValidated(record, token, payload.comments, payload.timeLoggedMS)
+    const validatedRecord = await getRecordById(
+      request.params.recordId,
+      request.headers.authorization,
+      ['VALIDATED'],
+      true
     )
 
     await indexBundle(validatedRecord, token)

packages/workflow/test/mocks/records/validated.ts

@@ -0,0 +1,118 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+import {
+  Composition,
+  Encounter,
+  Location,
+  Observation,
+  Patient,
+  Practitioner,
+  PractitionerRole,
+  RelatedPerson,
+  SavedBundle,
+  Task,
+  TrackingID,
+  URLReference
+} from '@opencrvs/commons/types'
+import { UUID } from '@opencrvs/commons'
+import { READY_FOR_REVIEW_BIRTH_RECORD } from './readyForReview'
+
+export const VALIDATED_BIRTH_RECORD: SavedBundle<
+  | Composition
+  | Encounter
+  | Patient
+  | RelatedPerson
+  | Task
+  | Practitioner
+  | PractitionerRole
+  | Location
+  | Observation
+> = {
+  resourceType: 'Bundle',
+  type: 'document',
+  entry: [
+    ...READY_FOR_REVIEW_BIRTH_RECORD.entry.filter(
+      (e) => e.resource.resourceType !== 'Task'
+    ),
+    {
+      fullUrl:
+        '/fhir/Task/f00e742a-0900-488b-b7c1-9625d7b7e456/_history/4d67992c-ab35-4e26-a8b9-9447540cca00' as URLReference,
+      resource: {
+        resourceType: 'Task',
+        extension: [
+          {
+            url: 'http://opencrvs.org/specs/extension/contact-person',
+            valueString: 'MOTHER'
+          },
+          {
+            url: 'http://opencrvs.org/specs/extension/contact-person-email',
+            valueString: '[email protected]'
+          },
+          {
+            url: 'http://opencrvs.org/specs/extension/timeLoggedMS',
+            valueInteger: 210764
+          },
+          {
+            url: 'http://opencrvs.org/specs/extension/regLastUser',
+            valueReference: {
+              reference:
+                'Practitioner/4651d1cc-6072-4e34-bf20-b583f421a9f1' as `Practitioner/${UUID}`
+            }
+          },
+          {
+            url: 'http://opencrvs.org/specs/extension/regLastOffice',
+            valueReference: {
+              reference:
+                'Location/ce73938d-a188-4a78-9d19-35dfd4ca6957' as `Location/${UUID}`
+            }
+          }
+        ],
+        status: 'ready',
+        identifier: [
+          {
+            system: 'http://opencrvs.org/specs/id/draft-id',
+            value: '7c3af302-08c9-41af-8701-92de9a71a3e4'
+          },
+          {
+            system: 'http://opencrvs.org/specs/id/birth-tracking-id',
+            value: 'BQSQASX' as TrackingID
+          }
+        ],
+        lastModified: '2023-11-30T12:36:27.043Z',
+        businessStatus: {
+          coding: [
+            {
+              system: 'http://opencrvs.org/specs/reg-status',
+              code: 'VALIDATED'
+            }
+          ]
+        },
+        code: {
+          coding: [
+            {
+              system: 'http://opencrvs.org/specs/types',
+              code: 'BIRTH'
+            }
+          ]
+        },
+        focus: {
+          reference:
+            'Composition/c8b8e843-c5e0-49b5-96d9-a702ddb46454' as `Composition/${UUID}`
+        },
+        meta: {
+          lastUpdated: '2023-11-30T12:36:27.277+00:00',
+          versionId: '4d67992c-ab35-4e26-a8b9-9447540cca00'
+        },
+        id: 'f00e742a-0900-488b-b7c1-9625d7b7e456' as UUID
+      }
+    }
+  ]
+}