@opencrvs/toolkit 1.8.0-rc.fb0e687 → 1.8.0-rc.fb2e700

package/dist/commons/events/ActionType.d.ts

@@ -34,4 +34,6 @@ export type DeclarationUpdateActionType = z.infer<typeof DeclarationUpdateAction
 /** Actions which update annotation or status of an event. */
 export declare const annotationActions: z.ZodEnum<["DELETE", "CREATE", "NOTIFY", "DETECT_DUPLICATE", "REJECT", "MARKED_AS_DUPLICATE", "ARCHIVE", "PRINT_CERTIFICATE", "REQUEST_CORRECTION", "REJECT_CORRECTION", "APPROVE_CORRECTION", "READ", "ASSIGN", "UNASSIGN"]>;
 export type AnnotationActionType = z.infer<typeof annotationActions>;
+/** Actions which requires the user to be assigned */
+export declare const writeActions: z.ZodEnum<["DELETE", "NOTIFY", "DECLARE", "VALIDATE", "REGISTER", "DETECT_DUPLICATE", "REJECT", "MARKED_AS_DUPLICATE", "ARCHIVE", "PRINT_CERTIFICATE", "REQUEST_CORRECTION", "REJECT_CORRECTION", "APPROVE_CORRECTION"]>;
 //# sourceMappingURL=ActionType.d.ts.map

package/dist/commons/events/Draft.d.ts

@@ -819,6 +819,7 @@ export declare const DraftInput: z.ZodObject<z.objectUtil.extendShape<{
         postcodeOrZip?: string | null | undefined;
     }>]>>>;
     originalActionId: z.ZodOptional<z.ZodString>;
+    keepAssignment: z.ZodOptional<z.ZodBoolean>;
 }, {
     type: z.ZodEnum<["DELETE", "CREATE", "NOTIFY", "DECLARE", "VALIDATE", "REGISTER", "DETECT_DUPLICATE", "REJECT", "MARKED_AS_DUPLICATE", "ARCHIVE", "PRINT_CERTIFICATE", "REQUEST_CORRECTION", "REJECT_CORRECTION", "APPROVE_CORRECTION", "READ", "ASSIGN", "UNASSIGN"]>;
 }>, "strip", z.ZodTypeAny, {
@@ -902,6 +903,7 @@ export declare const DraftInput: z.ZodObject<z.objectUtil.extendShape<{
         originalFilename: string;
     }[] | undefined> | undefined;
     originalActionId?: string | undefined;
+    keepAssignment?: boolean | undefined;
 }, {
     type: "DECLARE" | "REGISTER" | "VALIDATE" | "DELETE" | "CREATE" | "NOTIFY" | "DETECT_DUPLICATE" | "REJECT" | "MARKED_AS_DUPLICATE" | "ARCHIVE" | "PRINT_CERTIFICATE" | "REQUEST_CORRECTION" | "REJECT_CORRECTION" | "APPROVE_CORRECTION" | "READ" | "ASSIGN" | "UNASSIGN";
     eventId: string;
@@ -983,6 +985,7 @@ export declare const DraftInput: z.ZodObject<z.objectUtil.extendShape<{
         originalFilename: string;
     }[] | undefined> | undefined;
     originalActionId?: string | undefined;
+    keepAssignment?: boolean | undefined;
 }>;
 export type Draft = z.infer<typeof Draft>;
 export type DraftInput = z.infer<typeof DraftInput>;

package/dist/commons/events/EventDocument.d.ts

@@ -5113,6 +5113,7 @@ export declare const EventDocument: z.ZodObject<{
         originalActionId: z.ZodOptional<z.ZodString>;
     }, {
         type: z.ZodLiteral<"UNASSIGN">;
+        assignedTo: z.ZodDefault<z.ZodLiteral<null>>;
     }>, "strip", z.ZodTypeAny, {
         type: "UNASSIGN";
         id: string;
@@ -5158,6 +5159,7 @@ export declare const EventDocument: z.ZodObject<{
             originalFilename: string;
         }[] | undefined>;
         createdAtLocation: string;
+        assignedTo: null;
         annotation?: Record<string, string | number | boolean | {
             type: string;
             filename: string;
@@ -5281,6 +5283,7 @@ export declare const EventDocument: z.ZodObject<{
             originalFilename: string;
         }[] | undefined> | undefined;
         originalActionId?: string | undefined;
+        assignedTo?: null | undefined;
     }>, z.ZodObject<z.objectUtil.extendShape<{
         id: z.ZodString;
         createdAt: z.ZodString;
@@ -6478,6 +6481,7 @@ export declare const EventDocument: z.ZodObject<{
             originalFilename: string;
         }[] | undefined>;
         createdAtLocation: string;
+        assignedTo: null;
         annotation?: Record<string, string | number | boolean | {
             type: string;
             filename: string;
@@ -7794,6 +7798,7 @@ export declare const EventDocument: z.ZodObject<{
             originalFilename: string;
         }[] | undefined> | undefined;
         originalActionId?: string | undefined;
+        assignedTo?: null | undefined;
     } | {
         type: "REGISTER";
         id: string;

package/dist/commons/events/TemplateConfig.d.ts

@@ -6,7 +6,7 @@ import { FieldValue } from './FieldValue';
 /**
  * Available system variables for configuration.
  */
-export type MetaFields = {
+export type SystemVariables = {
     $user: {
         province: string;
         district: string;
@@ -21,12 +21,12 @@ export type MetaFields = {
 type FlattenedKeyStrings<T, Prefix extends string = ''> = {
     [K in keyof T]: T[K] extends Record<string, any> ? FlattenedKeyStrings<T[K], `${Prefix}${K & string}.`> : `${Prefix}${K & string}`;
 }[keyof T];
-export type FlattenedMetaFields = FlattenedKeyStrings<MetaFields>;
+export type FlattenenedSystemVariables = FlattenedKeyStrings<SystemVariables>;
 /**
  * Default value for a field when configuring a form.
  */
-export type FieldConfigDefaultValue = FieldValue | FlattenedMetaFields | Record<string, FlattenedMetaFields | FieldValue>;
-export declare function isTemplateVariable(value: FieldConfigDefaultValue): value is FlattenedMetaFields;
+export type FieldConfigDefaultValue = FieldValue | FlattenenedSystemVariables | Record<string, FlattenenedSystemVariables | FieldValue>;
+export declare function isTemplateVariable(value: FieldConfigDefaultValue): value is FlattenenedSystemVariables;
 export declare function isFieldValue(value: FieldConfigDefaultValue): value is FieldValue;
 /**
  * Checks if given value is valid for a field, and known template variables are already resolved.

package/dist/commons/events/test.utils.d.ts

@@ -8,7 +8,7 @@ import { EventIndex } from './EventIndex';
 import { EventInput } from './EventInput';
 import { FieldValue } from './FieldValue';
 import { TranslationConfig } from './TranslationConfig';
-export declare function generateActionInput(configuration: EventConfig, action: ActionType): import("lodash").Dictionary<string | number | boolean | {
+export declare function generateActionDeclarationInput(configuration: EventConfig, action: ActionType): import("lodash").Dictionary<string | number | boolean | {
     type: string;
     filename: string;
     originalFilename: string;
@@ -46,7 +46,7 @@ export declare function generateActionInput(configuration: EventConfig, action:
     filename: string;
     originalFilename: string;
 }[] | undefined>;
-export declare function generateActionMetadataInput(configuration: EventConfig, action: ActionType): {};
+export declare function generateActionAnnotationInput(configuration: EventConfig, action: ActionType): {};
 export declare const eventPayloadGenerator: {
     create: (input?: Partial<EventInput>) => {
         transactionId: string;

package/dist/commons/events/utils.d.ts

@@ -2,7 +2,7 @@ import { ActionType, DeclarationActionType } from './ActionType';
 import { EventConfig } from './EventConfig';
 import { FieldConfig } from './FieldConfig';
 import { WorkqueueConfig } from './WorkqueueConfig';
-import { ActionUpdate, EventState } from './ActionDocument';
+import { Action, ActionUpdate, EventState } from './ActionDocument';
 import { PageConfig, VerificationPageConfig } from './PageConfig';
 import { Draft } from './Draft';
 import { EventDocument } from './EventDocument';
@@ -43,8 +43,45 @@ export declare function getActionReview(configuration: EventConfig, actionType:
 export declare function getActionReviewFields(configuration: EventConfig, actionType: DeclarationActionType): import("./FieldConfig").Inferred[];
 export declare function validateWorkqueueConfig(workqueueConfigs: WorkqueueConfig[]): void;
 export declare function isPageVisible(page: PageConfig, formValues: ActionUpdate): boolean;
-export declare const getVisiblePagesFormFields: (formConfig: FormConfig, formData: ActionUpdate) => import("./FieldConfig").Inferred[];
-export declare function stripHiddenFields(fields: FieldConfig[], declaration: EventState): import("lodash").Dictionary<string | number | boolean | {
+export declare function omitHiddenFields(fields: FieldConfig[], values: EventState): import("lodash").Dictionary<string | number | boolean | {
+    type: string;
+    filename: string;
+    originalFilename: string;
+} | {
+    country: string;
+    district: string;
+    addressType: "DOMESTIC";
+    province: string;
+    urbanOrRural: "URBAN";
+    number?: string | undefined;
+    town?: string | undefined;
+    residentialArea?: string | undefined;
+    street?: string | undefined;
+    zipCode?: string | undefined;
+} | {
+    country: string;
+    district: string;
+    addressType: "DOMESTIC";
+    province: string;
+    urbanOrRural: "RURAL";
+    village?: string | undefined;
+} | {
+    country: string;
+    state: string;
+    addressType: "INTERNATIONAL";
+    district2: string;
+    cityOrTown?: string | undefined;
+    addressLine1?: string | undefined;
+    addressLine2?: string | undefined;
+    addressLine3?: string | undefined;
+    postcodeOrZip?: string | undefined;
+} | {
+    type: string;
+    option: string;
+    filename: string;
+    originalFilename: string;
+}[] | undefined>;
+export declare function omitHiddenPaginatedFields(formConfig: FormConfig, declaration: EventState): import("lodash").Dictionary<string | number | boolean | {
     type: string;
     filename: string;
     originalFilename: string;
@@ -187,42 +224,13 @@ export declare function createEmptyDraft(eventId: string, draftId: string, actio
     };
 };
 export declare function isVerificationPage(page: PageConfig): page is VerificationPageConfig;
-export declare function deepMerge(currentDocument: ActionUpdate, actionDocument: ActionUpdate): Record<string, string | number | boolean | {
-    type: string;
-    filename: string;
-    originalFilename: string;
-} | {
-    country: string;
-    district: string;
-    addressType: "DOMESTIC";
-    province: string;
-    urbanOrRural: "URBAN";
-    number?: string | null | undefined;
-    town?: string | null | undefined;
-    residentialArea?: string | null | undefined;
-    street?: string | null | undefined;
-    zipCode?: string | null | undefined;
-} | {
-    country: string;
-    district: string;
-    addressType: "DOMESTIC";
-    province: string;
-    urbanOrRural: "RURAL";
-    village?: string | null | undefined;
-} | {
-    country: string;
-    state: string;
-    addressType: "INTERNATIONAL";
-    district2: string;
-    cityOrTown?: string | null | undefined;
-    addressLine1?: string | null | undefined;
-    addressLine2?: string | null | undefined;
-    addressLine3?: string | null | undefined;
-    postcodeOrZip?: string | null | undefined;
-} | {
-    type: string;
-    option: string;
-    filename: string;
-    originalFilename: string;
-}[] | undefined>;
+export declare function deepMerge<T extends Record<string, unknown>>(currentDocument: T, actionDocument: T): T;
+export declare function findLastAssignmentAction(actions: Action[]): Action | undefined;
+/** Tell compiler that accessing record with arbitrary key might result to undefined
+ * Use when you **cannot guarantee**  that key exists in the record
+ */
+export type IndexMap<T> = {
+    [id: string]: T | undefined;
+};
+export declare function isWriteAction(actionType: ActionType): boolean;
 //# sourceMappingURL=utils.d.ts.map

package/dist/commons/events/utils.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=utils.test.d.ts.map

package/dist/events/index.js

@@ -152,10 +152,11 @@ __export(events_exports, {
   fieldTypes: () => fieldTypes,
   findActiveDrafts: () => findActiveDrafts,
   findAllFields: () => findAllFields,
+  findLastAssignmentAction: () => findLastAssignmentAction,
   findRecordActionPages: () => findRecordActionPages,
+  generateActionAnnotationInput: () => generateActionAnnotationInput,
+  generateActionDeclarationInput: () => generateActionDeclarationInput,
   generateActionDocument: () => generateActionDocument,
-  generateActionInput: () => generateActionInput,
-  generateActionMetadataInput: () => generateActionMetadataInput,
   generateEventDocument: () => generateEventDocument,
   generateEventDraftDocument: () => generateEventDraftDocument,
   generateTransactionId: () => generateTransactionId,
@@ -173,7 +174,6 @@ __export(events_exports, {
   getDeclarationFields: () => getDeclarationFields,
   getDeclarationPages: () => getDeclarationPages,
   getFieldValidationErrors: () => getFieldValidationErrors,
-  getVisiblePagesFormFields: () => getVisiblePagesFormFields,
   isAddressFieldType: () => isAddressFieldType,
   isAdministrativeAreaFieldType: () => isAdministrativeAreaFieldType,
   isBulletListFieldType: () => isBulletListFieldType,
@@ -206,17 +206,20 @@ __export(events_exports, {
   isTextFieldType: () => isTextFieldType,
   isUndeclaredDraft: () => isUndeclaredDraft,
   isVerificationPage: () => isVerificationPage,
+  isWriteAction: () => isWriteAction,
   mapFieldTypeToEmptyValue: () => mapFieldTypeToEmptyValue,
   mapFieldTypeToMockValue: () => mapFieldTypeToMockValue,
   mapFieldTypeToZod: () => mapFieldTypeToZod,
   never: () => never,
   not: () => not,
+  omitHiddenFields: () => omitHiddenFields,
+  omitHiddenPaginatedFields: () => omitHiddenPaginatedFields,
   or: () => or,
-  stripHiddenFields: () => stripHiddenFields,
   user: () => user,
   validate: () => validate,
   validateFieldInput: () => validateFieldInput,
-  validateWorkqueueConfig: () => validateWorkqueueConfig
+  validateWorkqueueConfig: () => validateWorkqueueConfig,
+  writeActions: () => writeActions
 });
 module.exports = __toCommonJS(events_exports);
 
@@ -797,6 +800,12 @@ var DeclarationUpdateActions = ActionTypes.extract(
   declarationUpdateActionValues
 );
 var annotationActions = ActionTypes.exclude(declarationActionValues);
+var writeActions = ActionTypes.exclude([
+  ActionType.CREATE,
+  ActionType.READ,
+  ActionType.ASSIGN,
+  ActionType.UNASSIGN
+]);
 
 // ../commons/src/events/FormConfig.ts
 var import_zod8 = require("zod");
@@ -1632,7 +1641,7 @@ function validateFieldInput({
   );
   return rawError.error?.issues.map((issue) => issue.message) ?? [];
 }
-function getFieldValidationErrors({
+function runFieldValidations({
   field: field2,
   values
 }) {
@@ -1640,6 +1649,23 @@ function getFieldValidationErrors({
     $form: values,
     $now: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" })
   };
+  const fieldValidationResult = validateFieldInput({
+    field: field2,
+    value: values[field2.id]
+  });
+  const customValidationResults = runCustomFieldValidations({
+    field: field2,
+    conditionalParameters
+  });
+  return {
+    // Assumes that custom validation errors are based on the field type, and extend the validation.
+    errors: [...fieldValidationResult, ...customValidationResults]
+  };
+}
+function getFieldValidationErrors({
+  field: field2,
+  values
+}) {
   if (!isFieldVisible(field2, values) || !isFieldEnabled(field2, values)) {
     if (values[field2.id]) {
       return {
@@ -1654,18 +1680,10 @@ function getFieldValidationErrors({
       errors: []
     };
   }
-  const fieldValidationResult = validateFieldInput({
-    field: field2,
-    value: values[field2.id]
-  });
-  const customValidationResults = runCustomFieldValidations({
+  return runFieldValidations({
     field: field2,
-    conditionalParameters
+    values
   });
-  return {
-    // Assumes that custom validation errors are based on the field type, and extend the validation.
-    errors: [...fieldValidationResult, ...customValidationResults]
-  };
 }
 
 // ../commons/src/uuid.ts
@@ -1765,27 +1783,19 @@ function isPageVisible(page, formValues) {
     $now: (0, import_date_fns2.formatISO)(/* @__PURE__ */ new Date(), { representation: "date" })
   });
 }
-var getVisiblePagesFormFields = (formConfig, formData) => {
-  return formConfig.pages.filter((p) => isPageVisible(p, formData)).flatMap((p) => p.fields);
-};
-function isOptionalUncheckedCheckbox(field2, form) {
-  if (field2.type !== FieldType.CHECKBOX || field2.required) {
-    return false;
-  }
-  return !form[field2.id];
-}
-function stripHiddenFields(fields, declaration) {
-  return (0, import_lodash.omitBy)(declaration, (_, fieldId) => {
+function omitHiddenFields(fields, values) {
+  return (0, import_lodash.omitBy)(values, (_, fieldId) => {
     const field2 = fields.find((f) => f.id === fieldId);
     if (!field2) {
       return true;
     }
-    if (isOptionalUncheckedCheckbox(field2, declaration)) {
-      return true;
-    }
-    return !isFieldVisible(field2, declaration);
+    return !isFieldVisible(field2, values);
   });
 }
+function omitHiddenPaginatedFields(formConfig, declaration) {
+  const visiblePagesFormFields = formConfig.pages.filter((p) => isPageVisible(p, declaration)).flatMap((p) => p.fields);
+  return omitHiddenFields(visiblePagesFormFields, declaration);
+}
 function findActiveDrafts(event2, drafts) {
   const actions = event2.actions.slice().filter(({ type }) => type !== ActionType.READ).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
   const lastAction = actions[actions.length - 1];
@@ -1828,6 +1838,14 @@ function deepMerge(currentDocument, actionDocument) {
     }
   );
 }
+function findLastAssignmentAction(actions) {
+  return actions.filter(
+    ({ type }) => type === ActionType.ASSIGN || type === ActionType.UNASSIGN
+  ).reduce((latestAction, action) => !latestAction || action.createdAt > latestAction.createdAt ? action : latestAction, void 0);
+}
+function isWriteAction(actionType) {
+  return writeActions.safeParse(actionType).success;
+}
 
 // ../commons/src/events/EventConfig.ts
 var EventConfig = import_zod20.z.object({
@@ -1908,7 +1926,8 @@ var AssignedAction = ActionBase.merge(
 );
 var UnassignedAction = ActionBase.merge(
   import_zod21.z.object({
-    type: import_zod21.z.literal(ActionType.UNASSIGN)
+    type: import_zod21.z.literal(ActionType.UNASSIGN),
+    assignedTo: import_zod21.z.literal(null).default(null)
   })
 );
 var RegisterAction = ActionBase.merge(
@@ -2027,7 +2046,8 @@ var BaseActionInput = import_zod22.z.object({
   transactionId: import_zod22.z.string(),
   declaration: ActionUpdate.default({}),
   annotation: ActionUpdate.optional(),
-  originalActionId: import_zod22.z.string().optional()
+  originalActionId: import_zod22.z.string().optional(),
+  keepAssignment: import_zod22.z.boolean().optional()
 });
 var CreateActionInput = BaseActionInput.merge(
   import_zod22.z.object({
@@ -2238,7 +2258,7 @@ function aggregateActionDeclarations(actions) {
 }
 function deepDropNulls(obj) {
   if (Array.isArray(obj)) {
-    return obj;
+    return obj.map(deepDropNulls);
   }
   if (obj !== null && typeof obj === "object") {
     return Object.entries(obj).reduce((acc, [key, value]) => {
@@ -3398,9 +3418,8 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
         },
         {
           id: "applicant.dob",
-          type: "DATE",
+          type: FieldType.DATE,
           required: true,
-          conditionals: [],
           validation: [
             {
               message: {
@@ -3411,12 +3430,50 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
               validator: field("applicant.dob").isBefore().now()
             }
           ],
+          conditionals: [
+            {
+              type: ConditionalType.SHOW,
+              conditional: field("applicant.dobUnknown").isFalsy()
+            }
+          ],
           label: {
             defaultMessage: "Applicant's date of birth",
             description: "This is the label for the field",
             id: "v2.event.tennis-club-membership.action.declare.form.section.who.field.dob.label"
           }
         },
+        {
+          id: "applicant.dobUnknown",
+          type: FieldType.CHECKBOX,
+          required: false,
+          label: {
+            defaultMessage: "Exact date of birth unknown",
+            description: "This is the label for the field",
+            id: "v2.event.tennis-club-membership.action.declare.form.section.who.field.dobUnknown.label"
+          },
+          conditionals: [
+            {
+              type: ConditionalType.DISPLAY_ON_REVIEW,
+              conditional: never()
+            }
+          ]
+        },
+        {
+          id: "applicant.age",
+          type: FieldType.NUMBER,
+          required: true,
+          label: {
+            defaultMessage: "Age of tennis-member",
+            description: "This is the label for the field",
+            id: "v2.event.tennis-club-membership.action.declare.form.section.who.field.age.label"
+          },
+          conditionals: [
+            {
+              type: ConditionalType.SHOW,
+              conditional: field("applicant.dobUnknown").isEqualTo(true)
+            }
+          ]
+        },
         {
           id: "applicant.image",
           type: FieldType.FILE,
@@ -3932,7 +3989,7 @@ var tennisClubMembershipEvent = defineConfig({
 });
 
 // ../commons/src/events/test.utils.ts
-function fieldConfigsToActionAnnotation(fields) {
+function fieldConfigsToActionPayload(fields) {
   return fields.reduce(
     (acc, field2, i) => ({
       ...acc,
@@ -3941,22 +3998,23 @@ function fieldConfigsToActionAnnotation(fields) {
     {}
   );
 }
-function generateActionInput(configuration, action) {
+function generateActionDeclarationInput(configuration, action) {
   const parsed = DeclarationUpdateActions.safeParse(action);
   if (parsed.success) {
     const fields = getDeclarationFields(configuration);
-    const annotation = fieldConfigsToActionAnnotation(fields);
-    return stripHiddenFields(fields, annotation);
+    const declarationConfig = getDeclaration(configuration);
+    const declaration = fieldConfigsToActionPayload(fields);
+    return omitHiddenPaginatedFields(declarationConfig, declaration);
   }
   console.warn(`${action} is not a declaration action. Setting data as {}.`);
   return {};
 }
-function generateActionMetadataInput(configuration, action) {
+function generateActionAnnotationInput(configuration, action) {
   const actionConfig = configuration.actions.find(
     (ac) => ac.type === action
   );
   const annotationFields = actionConfig ? getActionAnnotationFields(actionConfig) : [];
-  const annotation = fieldConfigsToActionAnnotation(annotationFields);
+  const annotation = fieldConfigsToActionPayload(annotationFields);
   const visibleVerificationPageIds = findRecordActionPages(
     configuration,
     action
@@ -3968,7 +4026,7 @@ function generateActionMetadataInput(configuration, action) {
     }),
     {}
   );
-  const fieldBasedPayload = stripHiddenFields(annotationFields, annotation);
+  const fieldBasedPayload = omitHiddenFields(annotationFields, annotation);
   return {
     ...fieldBasedPayload,
     ...visiblePageVerificationMap
@@ -4014,8 +4072,11 @@ var eventPayloadGenerator = {
     declare: (eventId, input = {}) => ({
       type: ActionType.DECLARE,
       transactionId: input.transactionId ?? getUUID(),
-      declaration: input.declaration ?? generateActionInput(tennisClubMembershipEvent, ActionType.DECLARE),
-      annotation: input.annotation ?? generateActionMetadataInput(
+      declaration: input.declaration ?? generateActionDeclarationInput(
+        tennisClubMembershipEvent,
+        ActionType.DECLARE
+      ),
+      annotation: input.annotation ?? generateActionAnnotationInput(
         tennisClubMembershipEvent,
         ActionType.DECLARE
       ),
@@ -4028,7 +4089,10 @@ var eventPayloadGenerator = {
       let declaration = input.declaration;
       if (!declaration) {
         const partialDeclaration = (0, import_lodash2.omitBy)(
-          generateActionInput(tennisClubMembershipEvent, ActionType.DECLARE),
+          generateActionDeclarationInput(
+            tennisClubMembershipEvent,
+            ActionType.DECLARE
+          ),
           import_lodash2.isString
         );
         declaration = partialDeclaration;
@@ -4043,8 +4107,11 @@ var eventPayloadGenerator = {
     validate: (eventId, input = {}) => ({
       type: ActionType.VALIDATE,
       transactionId: input.transactionId ?? getUUID(),
-      declaration: input.declaration ?? generateActionInput(tennisClubMembershipEvent, ActionType.VALIDATE),
-      annotation: input.annotation ?? generateActionMetadataInput(
+      declaration: input.declaration ?? generateActionDeclarationInput(
+        tennisClubMembershipEvent,
+        ActionType.VALIDATE
+      ),
+      annotation: input.annotation ?? generateActionAnnotationInput(
         tennisClubMembershipEvent,
         ActionType.VALIDATE
       ),
@@ -4078,7 +4145,7 @@ var eventPayloadGenerator = {
       type: ActionType.REJECT,
       transactionId: input.transactionId ?? getUUID(),
       declaration: {},
-      annotation: input.annotation ?? generateActionMetadataInput(
+      annotation: input.annotation ?? generateActionAnnotationInput(
         tennisClubMembershipEvent,
         ActionType.REJECT
       ),
@@ -4088,8 +4155,11 @@ var eventPayloadGenerator = {
     register: (eventId, input = {}) => ({
       type: ActionType.REGISTER,
       transactionId: input.transactionId ?? getUUID(),
-      declaration: input.declaration ?? generateActionInput(tennisClubMembershipEvent, ActionType.REGISTER),
-      annotation: input.annotation ?? generateActionMetadataInput(
+      declaration: input.declaration ?? generateActionDeclarationInput(
+        tennisClubMembershipEvent,
+        ActionType.REGISTER
+      ),
+      annotation: input.annotation ?? generateActionAnnotationInput(
         tennisClubMembershipEvent,
         ActionType.REGISTER
       ),
@@ -4099,7 +4169,7 @@ var eventPayloadGenerator = {
       type: ActionType.PRINT_CERTIFICATE,
       transactionId: input.transactionId ?? getUUID(),
       declaration: {},
-      annotation: input.annotation ?? generateActionMetadataInput(
+      annotation: input.annotation ?? generateActionAnnotationInput(
         tennisClubMembershipEvent,
         ActionType.PRINT_CERTIFICATE
       ),
@@ -4109,11 +4179,11 @@ var eventPayloadGenerator = {
       request: (eventId, input = {}) => ({
         type: ActionType.REQUEST_CORRECTION,
         transactionId: input.transactionId ?? getUUID(),
-        declaration: input.declaration ?? generateActionInput(
+        declaration: input.declaration ?? generateActionDeclarationInput(
           tennisClubMembershipEvent,
           ActionType.REQUEST_CORRECTION
         ),
-        annotation: input.annotation ?? generateActionMetadataInput(
+        annotation: input.annotation ?? generateActionAnnotationInput(
           tennisClubMembershipEvent,
           ActionType.REQUEST_CORRECTION
         ),
@@ -4123,7 +4193,7 @@ var eventPayloadGenerator = {
         type: ActionType.APPROVE_CORRECTION,
         transactionId: input.transactionId ?? getUUID(),
         declaration: {},
-        annotation: input.annotation ?? generateActionMetadataInput(
+        annotation: input.annotation ?? generateActionAnnotationInput(
           tennisClubMembershipEvent,
           ActionType.APPROVE_CORRECTION
         ),
@@ -4134,7 +4204,7 @@ var eventPayloadGenerator = {
         type: ActionType.REJECT_CORRECTION,
         transactionId: input.transactionId ?? getUUID(),
         declaration: {},
-        annotation: input.annotation ?? generateActionMetadataInput(
+        annotation: input.annotation ?? generateActionAnnotationInput(
           tennisClubMembershipEvent,
           ActionType.REJECT_CORRECTION
         ),
@@ -4156,7 +4226,7 @@ function generateActionDocument({
     createdBy: getUUID(),
     id: getUUID(),
     createdAtLocation: "TODO",
-    declaration: generateActionInput(configuration, action),
+    declaration: generateActionDeclarationInput(configuration, action),
     annotation: {},
     ...defaults,
     status: ActionStatus.Accepted
@@ -4169,7 +4239,7 @@ function generateActionDocument({
     case ActionType.DECLARE:
       return { ...actionBase, type: action };
     case ActionType.UNASSIGN:
-      return { ...actionBase, type: action };
+      return { ...actionBase, type: action, assignedTo: null };
     case ActionType.ASSIGN:
       return { ...actionBase, assignedTo: getUUID(), type: action };
     case ActionType.VALIDATE: