Merge pull request #1135 from opencrvs/v2.0-temp

V2.0 temp

Author: cibelius

infrastructure/postgres/setup-analytics.sh

@@ -85,6 +85,8 @@ CREATE TABLE IF NOT EXISTS analytics.event_actions (
   UNIQUE (id, event_id)
 );
 
+ALTER TABLE analytics.event_actions ADD COLUMN IF NOT EXISTS custom_action_type TEXT;
+
 CREATE TABLE IF NOT EXISTS analytics.location_levels (
   id text PRIMARY KEY,
   level int NOT NULL,

package.json

@@ -69,7 +69,7 @@
     "@hapi/boom": "^9.1.1",
     "@hapi/hapi": "^20.0.1",
     "@hapi/inert": "^6.0.3",
-    "@opencrvs/toolkit": "1.9.0-rc.79b0f42",
+    "@opencrvs/toolkit": "1.9.0-rc.8476ac9",
     "@types/chalk": "^2.2.0",
     "@types/csv2json": "^1.4.0",
     "@types/fhir": "^0.0.30",
@@ -114,7 +114,7 @@
     "tsconfig-paths": "^3.8.0",
     "typescript": "^5.1.6",
     "uuid": "^11.1.0",
-    "zod": "^3.24.1"
+    "zod": "^4.1.12"
   },
   "lint-staged": {
     "src/**/*.{ts,graphql}": [

src/api/custom-event/handler.ts

@@ -24,6 +24,13 @@ export function getCustomEventsHandler(
     .code(200)
 }
 
+export async function onCustomActionHandler(
+  request: ActionConfirmationRequest,
+  h: Hapi.ResponseToolkit
+) {
+  return h.response().code(200)
+}
+
 export async function onAnyActionHandler(
   request: ActionConfirmationRequest,
   h: Hapi.ResponseToolkit
@@ -33,6 +40,7 @@ export async function onAnyActionHandler(
   const token = request.auth.artifacts.token as string
 
   const event = request.payload
+
   await sendInformantNotification({ event, token })
 
   return h.response().code(200)

src/api/notification/informantNotification.ts

@@ -26,8 +26,6 @@ import { InformantType as BirthInformantType } from '@countryconfig/form/v2/birt
 import { InformantTemplateType } from './sms-service'
 import { generateFailureLog, NotificationParams, notify } from './handler'
 import { InformantType as DeathInformantType } from '@countryconfig/form/v2/death/forms/pages/informant'
-import { birthEvent } from '@countryconfig/form/v2/birth'
-import { deathEvent } from '@countryconfig/form/v2/death'
 
 const resolveName = (name: FieldUpdateValue) => {
   const nameObj = {
@@ -77,18 +75,6 @@ function getInformant(eventType: string, declaration: Record<string, any>) {
   throw new Error('Invalid event type')
 }
 
-function getEventConfig(eventType: string) {
-  if (eventType === Event.Birth) {
-    return birthEvent
-  }
-
-  if (eventType === Event.Death) {
-    return deathEvent
-  }
-
-  throw new Error('Invalid event type')
-}
-
 async function getNotificationParams(
   event: EventDocument,
   token: string,

src/data-seeding/roles/roles.ts

@@ -221,7 +221,8 @@ export const roles: Role[] = [
       'record.register[event=birth|death|tennis-club-membership]',
       'record.registered.print-certified-copies[event=birth|death|tennis-club-membership]',
       'record.registered.correct[event=birth|death|tennis-club-membership]',
-      'record.unassign-others[event=birth|death|tennis-club-membership]'
+      'record.unassign-others[event=birth|death|tennis-club-membership]',
+      'record.custom-action[event=birth,customActionType=Approve]'
     ]
   },
   {

src/form/tennis-club-membership.ts

@@ -908,8 +908,7 @@ export const tennisClubMembershipEvent = defineConfig({
         description:
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.tennis-club-membership.action.validate.label'
-      },
-      review: TENNIS_CLUB_DECLARATION_REVIEW
+      }
     },
     {
       type: ActionType.REGISTER,
@@ -918,8 +917,7 @@ export const tennisClubMembershipEvent = defineConfig({
         description:
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.tennis-club-membership.action.register.label'
-      },
-      review: TENNIS_CLUB_DECLARATION_REVIEW
+      }
     },
     {
       type: ActionType.PRINT_CERTIFICATE,

src/form/v2/birth/index.ts

@@ -10,9 +10,11 @@
  */
 import {
   ActionType,
+  and,
   ConditionalType,
   defineConfig,
-  field
+  field,
+  not
 } from '@opencrvs/toolkit/events'
 import {
   BIRTH_DECLARATION_FORM,
@@ -24,6 +26,7 @@ import { BIRTH_CERTIFICATE_COLLECTOR_FORM } from './forms/printForm'
 import { PlaceOfBirth } from './forms/pages/child'
 import { CORRECTION_FORM } from './forms/correctionForm'
 import { dedupConfig } from './dedupConfig'
+import { applicationConfig } from '@countryconfig/api/application/application-config'
 
 export const birthEvent = defineConfig({
   id: Event.Birth,
@@ -45,6 +48,17 @@ export const birthEvent = defineConfig({
     description:
       'This is a fallback title if actual title resolves to empty string'
   },
+  flags: [
+    {
+      id: 'approval-required-for-late-registration',
+      label: {
+        id: 'event.birth.flag.approval-required-for-late-registration',
+        defaultMessage: 'Approval required for late registration',
+        description: 'Flag label for approval required for late registration'
+      },
+      requiresAction: true
+    }
+  ],
   summary: {
     fields: [
       {
@@ -188,6 +202,47 @@ export const birthEvent = defineConfig({
           id: 'event.birth.action.detect-duplicate.label'
         },
         query: dedupConfig
+      },
+      flags: [
+        {
+          id: 'approval-required-for-late-registration',
+          operation: 'add',
+          conditional: and(
+            not(
+              field('child.dob')
+                .isAfter()
+                .days(applicationConfig.BIRTH.LATE_REGISTRATION_TARGET)
+                .inPast()
+            ),
+            field('child.dob').isBefore().now()
+          )
+        }
+      ]
+    },
+    {
+      type: ActionType.CUSTOM,
+      customActionType: 'Approve',
+      label: {
+        defaultMessage: 'Approve',
+        description:
+          'This is shown as the action name anywhere the user can trigger the action from',
+        id: 'event.birth.action.approve.label'
+      },
+      supportingCopy: {
+        defaultMessage:
+          'This birth has been registered late. You are now approving it for further validation and registration.',
+        description: 'This is the confirmation text for the approve action',
+        id: 'event.birth.action.approve.confirmationText'
+      },
+      form: [],
+      flags: [
+        { id: 'approval-required-for-late-registration', operation: 'remove' }
+      ],
+      auditHistoryLabel: {
+        defaultMessage: 'Approved',
+        description:
+          'The label to show in audit history for the approve action',
+        id: 'event.birth.action.approve.audit-history-label'
       }
     },
     {
@@ -198,7 +253,6 @@ export const birthEvent = defineConfig({
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.birth.action.validate.label'
       },
-      review: BIRTH_DECLARATION_REVIEW,
       deduplication: {
         id: 'birth-deduplication',
         label: {
@@ -218,7 +272,6 @@ export const birthEvent = defineConfig({
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.birth.action.register.label'
       },
-      review: BIRTH_DECLARATION_REVIEW,
       deduplication: {
         id: 'birth-deduplication',
         label: {

src/form/v2/death/index.ts

@@ -201,7 +201,6 @@ export const deathEvent = defineConfig({
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.death.action.validate.label'
       },
-      review: DEATH_DECLARATION_REVIEW,
       deduplication: {
         id: 'death-deduplication',
         label: {
@@ -221,7 +220,6 @@ export const deathEvent = defineConfig({
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.death.action.register.label'
       },
-      review: DEATH_DECLARATION_REVIEW,
       deduplication: {
         id: 'death-deduplication',
         label: {

src/index.ts

@@ -58,9 +58,9 @@ import { fontsHandler } from './api/fonts/handler'
 import { recordNotificationHandler } from './api/record-notification/handler'
 import {
   getCustomEventsHandler,
-  onAnyActionHandler
+  onAnyActionHandler,
+  onCustomActionHandler
 } from '@countryconfig/api/custom-event/handler'
-import { readFileSync } from 'fs'
 import {
   ActionDocument,
   ActionStatus,
@@ -92,7 +92,7 @@ export interface ITokenPayload {
 export default function getPlugins() {
   const plugins: any[] = [inert, JWT]
 
-  if (process.env.NODE_ENV === 'production') {
+  if (process.env.NODE_ENV !== 'test') {
     plugins.push({
       plugin: Pino,
       options: {
@@ -641,6 +641,16 @@ export async function createServer() {
     }
   })
 
+  server.route({
+    method: 'POST',
+    path: `/trigger/events/{event}/actions/${ActionType.CUSTOM}`,
+    handler: onCustomActionHandler,
+    options: {
+      tags: ['api', 'events'],
+      description: 'Receives notifications on event custom action'
+    }
+  })
+
   server.route({
     method: 'POST',
     path: '/trigger/events/{event}/actions/{action}',
@@ -748,9 +758,9 @@ export async function createServer() {
     await syncLocationLevels()
     await syncLocationStatistics()
 
-    const logMsg = `Server successfully started on ${COUNTRY_CONFIG_HOST}:${COUNTRY_CONFIG_PORT}`
-    logger.info(logMsg)
-    server.log('info', logMsg)
+    logger.info(
+      `Server successfully started on ${COUNTRY_CONFIG_HOST}:${COUNTRY_CONFIG_PORT}`
+    )
   }
 
   return { server, start, stop }

src/logger.ts

@@ -19,6 +19,11 @@ export const logger =
         ]
       })
     : pino({
+        serializers: {
+          req: () => undefined,
+          res: () => undefined,
+          responseTime: () => undefined
+        },
         transport: {
           target: 'pino-pretty',
           options: {