@opencrvs/toolkit 1.8.0-rc.fe4d9d5 → 1.8.0-rc.fe7c504

package/dist/events/index.js

@@ -69,7 +69,7 @@ __export(events_exports, {
   Conditional: () => Conditional,
   ConditionalType: () => ConditionalType,
   ConfirmableActions: () => ConfirmableActions,
-  CustomFlags: () => CustomFlags,
+  ContainsFlags: () => ContainsFlags,
   DEFAULT_DATE_OF_EVENT_PROPERTY: () => DEFAULT_DATE_OF_EVENT_PROPERTY,
   DataEntry: () => DataEntry,
   DataFieldValue: () => DataFieldValue,
@@ -124,6 +124,7 @@ __export(events_exports, {
   GenericAddressValue: () => GenericAddressValue,
   GeographicalArea: () => GeographicalArea,
   ImageMimeType: () => ImageMimeType,
+  InherentFlags: () => InherentFlags,
   LanguageConfig: () => LanguageConfig,
   LegalStatuses: () => LegalStatuses,
   MarkedAsDuplicateActionInput: () => MarkedAsDuplicateActionInput,
@@ -131,7 +132,6 @@ __export(events_exports, {
   NameFieldUpdateValue: () => NameFieldUpdateValue,
   NameFieldValue: () => NameFieldValue,
   NonEmptyTextValue: () => NonEmptyTextValue,
-  Not: () => Not,
   NotifyActionInput: () => NotifyActionInput,
   NumberFieldValue: () => NumberFieldValue,
   PageConfig: () => PageConfig,
@@ -155,10 +155,10 @@ __export(events_exports, {
   RuralAddressValue: () => RuralAddressValue,
   SearchField: () => SearchField,
   SearchQueryParams: () => SearchQueryParams,
+  SearchScopeAccessLevels: () => SearchScopeAccessLevels,
   SelectOption: () => SelectOption,
   ShowConditional: () => ShowConditional,
   SignatureFieldValue: () => SignatureFieldValue,
-  StatusChangingActions: () => StatusChangingActions,
   SummaryConfig: () => SummaryConfig,
   TENNIS_CLUB_MEMBERSHIP: () => TENNIS_CLUB_MEMBERSHIP,
   TestUserRole: () => TestUserRole,
@@ -169,6 +169,7 @@ __export(events_exports, {
   UrbanAddressValue: () => UrbanAddressValue,
   User: () => User,
   ValidateActionInput: () => ValidateActionInput,
+  ValidationConfig: () => ValidationConfig,
   VerificationActionConfig: () => VerificationActionConfig,
   VerificationPageConfig: () => VerificationPageConfig,
   WRITE_ACTION_SCOPES: () => WRITE_ACTION_SCOPES,
@@ -187,6 +188,7 @@ __export(events_exports, {
   alwaysTrue: () => alwaysTrue,
   and: () => and,
   annotationActions: () => annotationActions,
+  applyDeclarationToEventIndex: () => applyDeclarationToEventIndex,
   applyDraftsToEventIndex: () => applyDraftsToEventIndex,
   areConditionsMet: () => areConditionsMet,
   compositeFieldTypes: () => compositeFieldTypes,
@@ -227,8 +229,10 @@ __export(events_exports, {
   generateEventDraftDocument: () => generateEventDraftDocument,
   generateRandomName: () => generateRandomName,
   generateRandomSignature: () => generateRandomSignature,
+  generateRegistrationNumber: () => generateRegistrationNumber,
   generateTransactionId: () => generateTransactionId,
   generateTranslationConfig: () => generateTranslationConfig,
+  generateUuid: () => generateUuid,
   generateWorkqueues: () => generateWorkqueues,
   getAcceptedActions: () => getAcceptedActions,
   getActionAnnotation: () => getActionAnnotation,
@@ -304,6 +308,7 @@ __export(events_exports, {
   omitHiddenFields: () => omitHiddenFields,
   omitHiddenPaginatedFields: () => omitHiddenPaginatedFields,
   or: () => or,
+  resolveDateOfEvent: () => resolveDateOfEvent,
   runFieldValidations: () => runFieldValidations,
   user: () => user,
   validate: () => validate,
@@ -479,8 +484,8 @@ var NameFieldValue = import_zod3.z.object({
   middlename: import_zod3.z.string().optional()
 });
 var NameFieldUpdateValue = import_zod3.z.object({
-  firstname: import_zod3.z.string(),
-  surname: import_zod3.z.string(),
+  firstname: import_zod3.z.string().nullish(),
+  surname: import_zod3.z.string().nullish(),
   middlename: import_zod3.z.string().nullish()
 }).or(import_zod3.z.null()).or(import_zod3.z.undefined());
 var RuralAddressUpdateValue = AdminStructure.extend({
@@ -571,18 +576,18 @@ var FieldReference = import_zod5.z.object({
   $$field: FieldId
 }).describe("Reference to a field by its ID");
 var ParentReference = FieldReference.optional();
+var ValidationConfig = import_zod5.z.object({
+  validator: Conditional,
+  message: TranslationConfig
+});
 var BaseField = import_zod5.z.object({
   id: FieldId,
   parent: ParentReference,
   conditionals: import_zod5.z.array(FieldConditional).default([]).optional(),
   required: import_zod5.z.boolean().default(false).optional(),
+  secured: import_zod5.z.boolean().default(false).optional(),
   placeholder: TranslationConfig.optional(),
-  validation: import_zod5.z.array(
-    import_zod5.z.object({
-      validator: Conditional,
-      message: TranslationConfig
-    })
-  ).default([]).optional(),
+  validation: import_zod5.z.array(ValidationConfig).default([]).optional(),
   label: TranslationConfig,
   helperText: TranslationConfig.optional(),
   hideLabel: import_zod5.z.boolean().default(false).optional()
@@ -972,16 +977,6 @@ var writeActions = ActionTypes.exclude([
   ActionType.ASSIGN,
   ActionType.UNASSIGN
 ]);
-var StatusChangingActions = ActionTypes.extract([
-  ActionType.CREATE,
-  ActionType.NOTIFY,
-  ActionType.DECLARE,
-  ActionType.VALIDATE,
-  ActionType.REGISTER,
-  ActionType.REJECT,
-  ActionType.ARCHIVE,
-  ActionType.PRINT_CERTIFICATE
-]);
 var workqueueActions = ActionTypes.exclude([
   ActionType.CREATE,
   ActionType.NOTIFY,
@@ -1301,6 +1296,9 @@ var BaseField3 = import_zod14.z.object({
        'conditionals' to an empty array ('[]') in the search config. This ensures they
        are always rendered in the advanced search form.
       `
+  ),
+  validations: import_zod14.z.array(ValidationConfig).default([]).optional().describe(
+    `In advanced search, we sometimes need to override the default field validations.`
   )
 });
 var SearchQueryParams = import_zod14.z.object({
@@ -1339,9 +1337,16 @@ var import_lodash = require("lodash");
 var import_zod18 = require("zod");
 var import_zod_openapi7 = require("zod-openapi");
 
-// ../commons/src/events/CreatedAtLocation.ts
+// ../commons/src/uuid.ts
+var import_uuid = require("uuid");
 var import_zod15 = require("zod");
-var CreatedAtLocation = import_zod15.z.string().nullish();
+var UUID = import_zod15.z.string().uuid().brand("UUID");
+function getUUID() {
+  return (0, import_uuid.v4)();
+}
+
+// ../commons/src/events/CreatedAtLocation.ts
+var CreatedAtLocation = UUID.nullish();
 
 // ../commons/src/authentication.ts
 var import_jwt_decode = __toESM(require("jwt-decode"));
@@ -1606,7 +1611,15 @@ var NotifyRecordScope = import_zod16.z.object({
     event: import_zod16.z.array(import_zod16.z.string())
   })
 });
-var ConfigurableScopes = import_zod16.z.discriminatedUnion("type", [
+var SearchScope = import_zod16.z.object({
+  type: import_zod16.z.literal("search"),
+  options: import_zod16.z.object({
+    event: import_zod16.z.array(import_zod16.z.string()).length(1),
+    access: import_zod16.z.array(import_zod16.z.enum(["my-jurisdiction", "all"])).length(1)
+  })
+});
+var ConfigurableRawScopes = import_zod16.z.discriminatedUnion("type", [
+  SearchScope,
   CreateUserScope,
   EditUserScope,
   WorkqueueScope,
@@ -1777,7 +1790,7 @@ var ActionStatus = {
   Rejected: "Rejected"
 };
 var ActionBase = import_zod18.z.object({
-  id: import_zod18.z.string(),
+  id: UUID,
   transactionId: import_zod18.z.string(),
   createdByUserType: TokenUserType,
   createdAt: import_zod18.z.string().datetime(),
@@ -1786,14 +1799,16 @@ var ActionBase = import_zod18.z.object({
   createdBySignature: import_zod18.z.string().nullish().describe("Reference to signature of the user who created the action"),
   createdAtLocation: CreatedAtLocation,
   declaration: ActionUpdate,
-  annotation: ActionUpdate.optional(),
+  annotation: ActionUpdate.optional().nullable(),
   status: import_zod18.z.enum([
     ActionStatus.Requested,
     ActionStatus.Accepted,
     ActionStatus.Rejected
   ]),
   // If the action is an asynchronous confirmation for another action, we will save the original action id here.
-  originalActionId: import_zod18.z.string().optional()
+  originalActionId: UUID.optional().nullable().describe(
+    "Reference to the original action that was asynchronously rejected or accepted by 3rd party integration."
+  )
 });
 var AssignedAction = ActionBase.merge(
   import_zod18.z.object({
@@ -1803,8 +1818,7 @@ var AssignedAction = ActionBase.merge(
 );
 var UnassignedAction = ActionBase.merge(
   import_zod18.z.object({
-    type: import_zod18.z.literal(ActionType.UNASSIGN),
-    assignedTo: import_zod18.z.literal(null)
+    type: import_zod18.z.literal(ActionType.UNASSIGN)
   })
 );
 var RegisterAction = ActionBase.merge(
@@ -2128,6 +2142,29 @@ var ajv = new import_ajv.default({
   allowUnionTypes: true
 });
 (0, import_ajv_formats.default)(ajv);
+ajv.addKeyword({
+  keyword: "daysFromNow",
+  type: "string",
+  schemaType: "object",
+  $data: true,
+  errors: true,
+  validate(schema, data, _, dataContext) {
+    if (!(dataContext && dataContext.rootData && typeof dataContext.rootData === "object" && "$now" in dataContext.rootData && typeof dataContext.rootData.$now === "string")) {
+      throw new Error("Validation context must contain $now");
+    }
+    const { days, clause } = schema;
+    if (typeof data !== "string") {
+      return false;
+    }
+    const date = new Date(data);
+    if (isNaN(date.getTime())) {
+      return false;
+    }
+    const now = new Date(dataContext.rootData.$now);
+    const offsetDate = new Date(now.getTime() + days * 24 * 60 * 60 * 1e3);
+    return clause === "after" ? (0, import_date_fns.isAfter)(date, offsetDate) : (0, import_date_fns.isBefore)(date, offsetDate);
+  }
+});
 function validate(schema, data) {
   return ajv.validate(schema, data);
 }
@@ -2193,7 +2230,7 @@ var errorMessages = {
     id: "v2.error.invalidEmail"
   },
   requiredField: {
-    defaultMessage: "Required for registration",
+    defaultMessage: "Required",
     description: "Error message when required field is missing",
     id: "v2.error.required"
   },
@@ -2341,12 +2378,6 @@ function getValidatorsForField(fieldId, validations) {
   }).filter((x) => x !== null);
 }
 
-// ../commons/src/uuid.ts
-var import_uuid = require("uuid");
-function getUUID() {
-  return (0, import_uuid.v4)();
-}
-
 // ../commons/src/utils.ts
 function getOrThrow(x, message) {
   if (x === void 0 || x === null) {
@@ -2354,6 +2385,9 @@ function getOrThrow(x, message) {
   }
   return x;
 }
+function joinValues(values, separator = " ") {
+  return values.filter((value) => !!value).join(separator).trim();
+}
 
 // ../commons/src/events/utils.ts
 function isDeclarationActionConfig(action) {
@@ -2455,7 +2489,7 @@ function createEmptyDraft(eventId, draftId, actionType) {
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       createdByUserType: TokenUserType.Enum.user,
       createdBy: "@todo",
-      createdAtLocation: "@todo",
+      createdAtLocation: "00000000-0000-0000-0000-000000000000",
       status: ActionStatus.Accepted,
       transactionId: "@todo",
       createdByRole: "@todo"
@@ -2644,7 +2678,8 @@ var SerializedUserField = import_zod21.z.object({
     "id",
     "name",
     "role",
-    "signatureFilename",
+    "signature",
+    "avatar",
     "primaryOfficeId"
   ])
 });
@@ -2748,9 +2783,6 @@ function createEventConditionals() {
     })
   };
 }
-function getDateFromNow(days) {
-  return new Date(Date.now() - days * 24 * 60 * 60 * 1e3).toISOString().split("T")[0];
-}
 function getDateRangeToFieldReference(fieldId, comparedFieldId, clause) {
   return {
     type: "object",
@@ -2769,6 +2801,20 @@ function isFieldReference(value) {
   return typeof value === "object" && value !== null && "$$field" in value;
 }
 function createFieldConditionals(fieldId) {
+  const getDayRange = (days, clause) => ({
+    type: "object",
+    properties: {
+      [fieldId]: {
+        type: "string",
+        format: "date",
+        daysFromNow: {
+          days,
+          clause
+        }
+      }
+    },
+    required: [fieldId]
+  });
   const getDateRange = (date, clause) => ({
     type: "object",
     properties: {
@@ -2787,12 +2833,8 @@ function createFieldConditionals(fieldId) {
     $$field: fieldId,
     isAfter: () => ({
       days: (days) => ({
-        inPast: () => defineFormConditional(
-          getDateRange(getDateFromNow(days), "formatMinimum")
-        ),
-        inFuture: () => defineFormConditional(
-          getDateRange(getDateFromNow(-days), "formatMinimum")
-        )
+        inPast: () => defineFormConditional(getDayRange(-days, "after")),
+        inFuture: () => defineFormConditional(getDayRange(days, "after"))
       }),
       date: (date) => {
         if (isFieldReference(date)) {
@@ -2807,16 +2849,12 @@ function createFieldConditionals(fieldId) {
         }
         return defineFormConditional(getDateRange(date, "formatMinimum"));
       },
-      now: () => defineFormConditional(getDateRange(getDateFromNow(0), "formatMinimum"))
+      now: () => defineFormConditional(getDateRange({ $data: "/$now" }, "formatMinimum"))
     }),
     isBefore: () => ({
       days: (days) => ({
-        inPast: () => defineFormConditional(
-          getDateRange(getDateFromNow(days), "formatMaximum")
-        ),
-        inFuture: () => defineFormConditional(
-          getDateRange(getDateFromNow(-days), "formatMaximum")
-        )
+        inPast: () => defineFormConditional(getDayRange(days, "before")),
+        inFuture: () => defineFormConditional(getDayRange(-days, "before"))
       }),
       date: (date) => {
         if (isFieldReference(date)) {
@@ -2831,7 +2869,7 @@ function createFieldConditionals(fieldId) {
         }
         return defineFormConditional(getDateRange(date, "formatMaximum"));
       },
-      now: () => defineFormConditional(getDateRange(getDateFromNow(0), "formatMaximum"))
+      now: () => defineFormConditional(getDateRange({ $data: "/$now" }, "formatMaximum"))
     }),
     isEqualTo: (value) => {
       if (isFieldReference(value)) {
@@ -3057,8 +3095,11 @@ var EventStatus = import_zod22.z.enum([
   "REJECTED",
   "ARCHIVED"
 ]);
-var CustomFlags = {
-  CERTIFICATE_PRINTED: "certificate-printed"
+var InherentFlags = {
+  PRINTED: "printed",
+  INCOMPLETE: "incomplete",
+  REJECTED: "rejected",
+  CORRECTION_REQUESTED: "correction-requested"
 };
 var Flag = import_zod22.z.string().regex(
   new RegExp(
@@ -3067,7 +3108,7 @@ var Flag = import_zod22.z.string().regex(
     ).join("|").toLowerCase()})$`
   ),
   "Flag must be in the format ActionType:ActionStatus (lowerCase)"
-).or(import_zod22.z.nativeEnum(CustomFlags));
+).or(import_zod22.z.nativeEnum(InherentFlags));
 var ZodDate = import_zod22.z.string().date();
 var ActionCreationMetadata = import_zod22.z.object({
   createdAt: import_zod22.z.string().datetime().describe("The timestamp when the action request was created."),
@@ -3090,7 +3131,7 @@ var LegalStatuses = import_zod22.z.object({
   [EventStatus.enum.REGISTERED]: RegistrationCreationMetadata.nullish()
 });
 var EventMetadata = import_zod22.z.object({
-  id: import_zod22.z.string(),
+  id: UUID,
   type: import_zod22.z.string().describe("The type of event, such as birth, death, or marriage."),
   status: EventStatus,
   legalStatuses: LegalStatuses.describe(
@@ -3105,7 +3146,9 @@ var EventMetadata = import_zod22.z.object({
     "Location of the user who created the event."
   ),
   createdBySignature: import_zod22.z.string().nullish().describe("Signature of the user who created the event."),
-  updatedAtLocation: import_zod22.z.string().nullish().describe("Location of the user who last changed the status."),
+  updatedAtLocation: UUID.nullish().describe(
+    "Location of the user who last changed the status."
+  ),
   updatedAt: import_zod22.z.string().datetime().describe(
     "Timestamp of the most recent *accepted* status change. Possibly 3rd party update, if action is validation asynchronously."
   ),
@@ -3284,8 +3327,11 @@ var Range = import_zod24.z.object({
 }).openapi({
   ref: "Range"
 });
-var Not = import_zod24.z.object({ type: import_zod24.z.literal("not"), term: import_zod24.z.string() }).openapi({
-  ref: "Not"
+var ContainsFlags = import_zod24.z.object({
+  anyOf: import_zod24.z.array(Flag).optional(),
+  noneOf: import_zod24.z.array(Flag).optional()
+}).openapi({
+  ref: "ContainsFlags"
 });
 var Within = import_zod24.z.object({ type: import_zod24.z.literal("within"), location: import_zod24.z.string() }).openapi({
   ref: "Within"
@@ -3306,7 +3352,7 @@ var DateCondition = import_zod24.z.union([ExactDate, RangeDate]).openapi({
 });
 var QueryInput = import_zod24.z.lazy(
   () => import_zod24.z.union([
-    import_zod24.z.discriminatedUnion("type", [Fuzzy, Exact, Range, Within, AnyOf, Not]),
+    import_zod24.z.discriminatedUnion("type", [Fuzzy, Exact, Range, Within, AnyOf]),
     import_zod24.z.record(import_zod24.z.string(), QueryInput)
   ])
 ).openapi({
@@ -3330,7 +3376,7 @@ var QueryExpression = import_zod24.z.object({
   createdBy: import_zod24.z.optional(Exact),
   updatedBy: import_zod24.z.optional(Exact),
   trackingId: import_zod24.z.optional(Exact),
-  flags: import_zod24.z.optional(import_zod24.z.array(import_zod24.z.union([AnyOf, Not]))),
+  flags: import_zod24.z.optional(ContainsFlags),
   data: QueryInput
 }).partial().refine((obj) => Object.values(obj).some((val) => val !== void 0), {
   message: "At least one query field must be specified."
@@ -3370,6 +3416,10 @@ var QueryType = import_zod24.z.object({
 }).openapi({
   ref: "QueryType"
 });
+var SearchScopeAccessLevels = {
+  MY_JURISDICTION: "my-jurisdiction",
+  ALL: "all"
+};
 
 // ../commons/src/events/CountryConfigQueryInput.ts
 var SerializableExact = import_zod25.z.object({
@@ -3385,6 +3435,11 @@ var SerializedQueryExpression = import_zod25.z.object({
   status: import_zod25.z.optional(import_zod25.z.union([AnyOfStatus, ExactStatus])),
   createdAt: import_zod25.z.optional(DateCondition),
   updatedAt: import_zod25.z.optional(DateCondition),
+  "legalStatus.REGISTERED.createdAt": import_zod25.z.optional(DateCondition),
+  "legalStatus.REGISTERED.createdAtLocation": import_zod25.z.optional(
+    import_zod25.z.union([Within, Exact])
+  ),
+  "legalStatus.REGISTERED.registrationNumber": import_zod25.z.optional(Exact),
   createdAtLocation: import_zod25.z.optional(
     import_zod25.z.union([SerializableWithin, SerializableExact])
   ),
@@ -3396,7 +3451,7 @@ var SerializedQueryExpression = import_zod25.z.object({
   createdByUserType: TokenUserType,
   updatedBy: import_zod25.z.optional(SerializableExact),
   trackingId: import_zod25.z.optional(Exact),
-  flags: import_zod25.z.optional(import_zod25.z.array(import_zod25.z.union([AnyOf, Not]))),
+  flags: import_zod25.z.optional(ContainsFlags),
   data: QueryInput
 }).partial();
 var Or2 = import_zod25.z.object({
@@ -3454,7 +3509,6 @@ var AvailableIcons = import_zod26.z.enum([
   "Copy",
   "Database",
   "DotsThreeVertical",
-  "DownloadSimple",
   "ArrowCounterClockwise",
   "MagnifyingGlassMinus",
   "MagnifyingGlassPlus",
@@ -3615,14 +3669,14 @@ var import_zod29 = require("zod");
 // ../commons/src/events/ActionInput.ts
 var import_zod28 = require("zod");
 var import_zod_openapi10 = require("zod-openapi");
-var import_uuid3 = require("uuid");
 (0, import_zod_openapi10.extendZodWithOpenApi)(import_zod28.z);
 var BaseActionInput = import_zod28.z.object({
-  eventId: import_zod28.z.string(),
+  eventId: UUID,
   transactionId: import_zod28.z.string(),
   declaration: ActionUpdate.default({}),
   annotation: ActionUpdate.optional(),
-  originalActionId: import_zod28.z.string().optional(),
+  originalActionId: UUID.optional(),
+  // should not be part of base action.
   keepAssignment: import_zod28.z.boolean().optional()
 });
 var CreateActionInput = BaseActionInput.merge(
@@ -3636,7 +3690,7 @@ var RegisterActionInput = BaseActionInput.merge(
     type: import_zod28.z.literal(ActionType.REGISTER).default(ActionType.REGISTER),
     registrationNumber: import_zod28.z.string().optional()
   })
-);
+).strict();
 var ValidateActionInput = BaseActionInput.merge(
   import_zod28.z.object({
     type: import_zod28.z.literal(ActionType.VALIDATE).default(ActionType.VALIDATE),
@@ -3650,7 +3704,7 @@ var NotifyActionInput = BaseActionInput.merge(
 ).openapi({
   default: {
     eventId: "<event-id-here>",
-    transactionId: (0, import_uuid3.v4)(),
+    transactionId: getUUID(),
     declaration: {},
     annotation: {},
     type: ActionType.NOTIFY
@@ -3717,7 +3771,7 @@ var ReadActionInput = BaseActionInput.merge(
     type: import_zod28.z.literal(ActionType.READ).default(ActionType.READ)
   })
 );
-var DeleteActionInput = import_zod28.z.object({ eventId: import_zod28.z.string() });
+var DeleteActionInput = import_zod28.z.object({ eventId: UUID });
 var ActionInput = import_zod28.z.discriminatedUnion("type", [
   CreateActionInput.openapi({ ref: "CreateActionInput" }),
   ValidateActionInput.openapi({ ref: "ValidateActionInput" }),
@@ -3748,8 +3802,8 @@ var ActionInput = import_zod28.z.discriminatedUnion("type", [
 
 // ../commons/src/events/Draft.ts
 var Draft = import_zod29.z.object({
-  id: import_zod29.z.string(),
-  eventId: import_zod29.z.string(),
+  id: UUID,
+  eventId: UUID,
   transactionId: import_zod29.z.string(),
   createdAt: import_zod29.z.string().datetime(),
   action: ActionBase.extend({
@@ -3767,18 +3821,18 @@ var DraftInput = BaseActionInput.extend({
 
 // ../commons/src/events/EventInput.ts
 var import_zod30 = require("zod");
-var import_uuid4 = require("uuid");
+var import_uuid8 = require("uuid");
 var EventInput = import_zod30.z.object({
   transactionId: import_zod30.z.string(),
   type: import_zod30.z.string()
-}).openapi({ default: { transactionId: (0, import_uuid4.v4)(), type: "v2.birth" } });
+}).openapi({ default: { transactionId: (0, import_uuid8.v4)(), type: "v2.birth" } });
 
 // ../commons/src/events/EventDocument.ts
 var import_zod31 = require("zod");
 var import_zod_openapi11 = require("zod-openapi");
 (0, import_zod_openapi11.extendZodWithOpenApi)(import_zod31.z);
 var EventDocument = import_zod31.z.object({
-  id: import_zod31.z.string(),
+  id: UUID,
   type: import_zod31.z.string(),
   createdAt: import_zod31.z.string().datetime(),
   updatedAt: import_zod31.z.string().datetime(),
@@ -3787,6 +3841,7 @@ var EventDocument = import_zod31.z.object({
 }).openapi({ ref: "EventDocument" });
 
 // ../commons/src/events/state/utils.ts
+var import_lodash2 = require("lodash");
 function getActionRequests(actionType, actions) {
   const filtered = actions.filter((action) => action.type === actionType);
   const accept = filtered.find(
@@ -3825,29 +3880,38 @@ function getDeclarationActionCreationMetadata(actionType, actions) {
     registrationNumber
   };
 }
+var updateActions = ActionTypes.extract([
+  ActionType.CREATE,
+  ActionType.NOTIFY,
+  ActionType.DECLARE,
+  ActionType.VALIDATE,
+  ActionType.REGISTER,
+  ActionType.REJECT,
+  ActionType.ARCHIVE,
+  ActionType.PRINT_CERTIFICATE,
+  ActionType.REQUEST_CORRECTION
+]);
 function getActionUpdateMetadata(actions) {
   const createAction = getOrThrow(
     actions.find((action) => action.type === ActionType.CREATE),
     `Event has no ${ActionType.CREATE} action`
   );
-  return StatusChangingActions.options.reduce(
-    (metadata, actionType) => {
-      const { accept, request } = getActionRequests(actionType, actions);
-      return {
-        createdAt: request?.createdAt ?? accept?.createdAt ?? metadata.createdAt,
-        createdBy: request?.createdBy ?? accept?.createdBy ?? metadata.createdBy,
-        createdByUserType: request?.createdByUserType ?? accept?.createdByUserType ?? metadata.createdByUserType,
-        createdAtLocation: request?.createdAtLocation ?? accept?.createdAtLocation ?? metadata.createdAtLocation,
-        createdByRole: request?.createdByRole ?? accept?.createdByRole ?? metadata.createdByRole
-      };
+  const metadataFields = [
+    "createdAt",
+    "createdBy",
+    "createdByUserType",
+    "createdAtLocation",
+    "createdByRole"
+  ];
+  return actions.filter(({ type }) => updateActions.safeParse(type).success).filter(({ status }) => status === ActionStatus.Accepted).reduce(
+    (_, action) => {
+      if (action.originalActionId) {
+        const originalAction = actions.find(({ id }) => id === action.originalActionId) ?? action;
+        return (0, import_lodash2.pick)(originalAction, metadataFields);
+      }
+      return (0, import_lodash2.pick)(action, metadataFields);
     },
-    {
-      createdAt: createAction.createdAt,
-      createdBy: createAction.createdBy,
-      createdByUserType: createAction.createdByUserType,
-      createdAtLocation: createAction.createdAtLocation,
-      createdByRole: createAction.createdByRole
-    }
+    (0, import_lodash2.pick)(createAction, metadataFields)
   );
 }
 function getLegalStatuses(actions) {
@@ -3863,15 +3927,69 @@ function getLegalStatuses(actions) {
   };
 }
 
-// ../commons/src/events/state/index.ts
-function getStatusFromActions(actions) {
-  const hasRejectedAction = actions.some(
-    (a) => a.status === ActionStatus.Rejected
+// ../commons/src/events/state/flags.ts
+function isCertificatePrinted(actions) {
+  return actions.reduce((prev, { type }) => {
+    if (type === ActionType.PRINT_CERTIFICATE) {
+      return true;
+    }
+    if (type === ActionType.APPROVE_CORRECTION) {
+      return false;
+    }
+    return prev;
+  }, false);
+}
+function isCorrectionRequested(actions) {
+  return actions.reduce((prev, { type }) => {
+    if (type === ActionType.REQUEST_CORRECTION) {
+      return true;
+    }
+    if (type === ActionType.APPROVE_CORRECTION) {
+      return false;
+    }
+    if (type === ActionType.REJECT_CORRECTION) {
+      return false;
+    }
+    return prev;
+  }, false);
+}
+function isDeclarationIncomplete(actions) {
+  return getStatusFromActions(actions) === EventStatus.enum.NOTIFIED;
+}
+function isRejected(actions) {
+  return getStatusFromActions(actions) === EventStatus.enum.REJECTED;
+}
+function getFlagsFromActions(actions) {
+  const sortedActions = actions.filter(({ type }) => !isMetaAction(type)).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+  const actionStatus = sortedActions.reduce(
+    (actionStatuses, { type, status }) => ({
+      ...actionStatuses,
+      [type]: status
+    }),
+    {}
   );
-  if (hasRejectedAction) {
-    return EventStatus.enum.REJECTED;
+  const flags = Object.entries(actionStatus).filter(([, status]) => status !== ActionStatus.Accepted).map(([type, status]) => {
+    const flag = joinValues([type, status], ":").toLowerCase();
+    return flag;
+  });
+  if (isCertificatePrinted(sortedActions)) {
+    flags.push(InherentFlags.PRINTED);
   }
-  return actions.reduce((status, action) => {
+  if (isCorrectionRequested(sortedActions)) {
+    flags.push(InherentFlags.CORRECTION_REQUESTED);
+  }
+  if (isDeclarationIncomplete(sortedActions)) {
+    flags.push(InherentFlags.INCOMPLETE);
+  }
+  if (isRejected(sortedActions)) {
+    flags.push(InherentFlags.REJECTED);
+  }
+  return flags;
+}
+
+// ../commons/src/events/state/index.ts
+function getStatusFromActions(actions) {
+  return actions.filter(({ status }) => status === ActionStatus.Accepted).reduce((status, action) => {
     switch (action.type) {
       case ActionType.CREATE:
         return EventStatus.enum.CREATED;
@@ -3901,38 +4019,6 @@ function getStatusFromActions(actions) {
     }
   }, EventStatus.enum.CREATED);
 }
-function getFlagsFromActions(actions) {
-  const sortedactions = actions.sort(
-    (a, b) => a.createdAt.localeCompare(b.createdAt)
-  );
-  const actionStatus = sortedactions.reduce(
-    (actionStatuses, { type, status }) => ({
-      ...actionStatuses,
-      [type]: status
-    }),
-    {}
-  );
-  const flags = Object.entries(actionStatus).filter(([, status]) => status !== ActionStatus.Accepted).map(([type, status]) => {
-    const flag = `${type.toLowerCase()}:${status.toLowerCase()}`;
-    return flag;
-  });
-  const isCertificatePrinted = sortedactions.reduce(
-    (prev, { type }) => {
-      if (type === ActionType.PRINT_CERTIFICATE) {
-        return true;
-      }
-      if (type === ActionType.APPROVE_CORRECTION) {
-        return false;
-      }
-      return prev;
-    },
-    false
-  );
-  if (isCertificatePrinted) {
-    flags.push(CustomFlags.CERTIFICATE_PRINTED);
-  }
-  return flags;
-}
 function getAssignedUserFromActions(actions) {
   return actions.reduce((user2, action) => {
     if (action.type === ActionType.ASSIGN) {
@@ -3999,6 +4085,13 @@ function getAcceptedActions(event2) {
   );
 }
 var DEFAULT_DATE_OF_EVENT_PROPERTY = "createdAt";
+function resolveDateOfEvent(eventMetadata, declaration, config) {
+  if (!config.dateOfEvent) {
+    return eventMetadata[DEFAULT_DATE_OF_EVENT_PROPERTY].split("T")[0];
+  }
+  const parsedDate = ZodDate.safeParse(declaration[config.dateOfEvent.$$field]);
+  return parsedDate.success ? parsedDate.data : void 0;
+}
 function getCurrentEventState(event2, config) {
   const creationAction = event2.actions.find(
     (action) => action.type === ActionType.CREATE
@@ -4012,17 +4105,6 @@ function getCurrentEventState(event2, config) {
   const requestActionMetadata = getActionUpdateMetadata(event2.actions);
   const acceptedActionMetadata = getActionUpdateMetadata(acceptedActions);
   const declaration = aggregateActionDeclarations(acceptedActions);
-  let dateOfEvent;
-  if (config.dateOfEvent) {
-    const parsedDate = ZodDate.safeParse(
-      declaration[config.dateOfEvent.$$field]
-    );
-    if (parsedDate.success) {
-      dateOfEvent = parsedDate.data;
-    }
-  } else {
-    dateOfEvent = event2[DEFAULT_DATE_OF_EVENT_PROPERTY].split("T")[0];
-  }
   return deepDropNulls({
     id: event2.id,
     type: event2.type,
@@ -4041,7 +4123,7 @@ function getCurrentEventState(event2, config) {
     declaration,
     trackingId: event2.trackingId,
     updatedByUserRole: requestActionMetadata.createdByRole,
-    dateOfEvent,
+    dateOfEvent: resolveDateOfEvent(event2, declaration, config),
     flags: getFlagsFromActions(event2.actions)
   });
 }
@@ -4070,19 +4152,29 @@ function getCurrentEventStateWithDrafts({
   };
   return getCurrentEventState(withDrafts, configuration);
 }
-function applyDraftsToEventIndex(eventIndex, drafts) {
+function applyDeclarationToEventIndex(eventIndex, declaration, eventConfiguration) {
+  const updatedDeclaration = deepMerge(eventIndex.declaration, declaration);
+  return {
+    ...eventIndex,
+    dateOfEvent: resolveDateOfEvent(
+      eventIndex,
+      updatedDeclaration,
+      eventConfiguration
+    ),
+    declaration: updatedDeclaration
+  };
+}
+function applyDraftsToEventIndex(eventIndex, drafts, eventConfiguration) {
   const indexedAt = eventIndex.updatedAt;
   const activeDrafts = drafts.filter(({ createdAt }) => new Date(createdAt) > new Date(indexedAt)).map((draft) => draft.action).sort();
   if (activeDrafts.length === 0) {
     return eventIndex;
   }
-  return {
-    ...eventIndex,
-    declaration: {
-      ...eventIndex.declaration,
-      ...activeDrafts[activeDrafts.length - 1].declaration
-    }
-  };
+  return applyDeclarationToEventIndex(
+    eventIndex,
+    activeDrafts[activeDrafts.length - 1].declaration,
+    eventConfiguration
+  );
 }
 function getAnnotationFromDrafts(drafts) {
   const actions = drafts.map((draft) => draft.action);
@@ -4122,24 +4214,37 @@ function generateTransactionId() {
   return getUUID();
 }
 
-// ../commons/src/events/User.ts
+// ../commons/src/documents.ts
 var import_zod32 = require("zod");
-var User = import_zod32.z.object({
-  id: import_zod32.z.string(),
-  name: import_zod32.z.array(
-    import_zod32.z.object({
-      use: import_zod32.z.string(),
-      given: import_zod32.z.array(import_zod32.z.string()),
-      family: import_zod32.z.string()
+var FullDocumentURL = import_zod32.z.string().brand("FullDocumentURL").describe(
+  "A full url with protocol, host, bucket name, starting from the root of the S3 server, https://minio/bucket-name/document-id.jpg"
+);
+var FullDocumentPath = import_zod32.z.string().brand("FullDocumentPath").describe(
+  "A full path with bucket name, starting from the root of the S3 server, /bucket-name/document-id.jpg"
+);
+var DocumentPath = import_zod32.z.string().brand("DocumentPath").describe(
+  "A full identifier starting from the root of the S3 bucket, e.g. /document-id.jpg or /directory/document-id.jpg but never /bucket-name/document-id.jpg"
+);
+
+// ../commons/src/events/User.ts
+var import_zod33 = require("zod");
+var User = import_zod33.z.object({
+  id: import_zod33.z.string(),
+  name: import_zod33.z.array(
+    import_zod33.z.object({
+      use: import_zod33.z.string(),
+      given: import_zod33.z.array(import_zod33.z.string()),
+      family: import_zod33.z.string()
     })
   ),
-  role: import_zod32.z.string(),
-  signatureFilename: import_zod32.z.string().optional()
+  role: import_zod33.z.string(),
+  avatar: FullDocumentPath.optional(),
+  signature: FullDocumentPath.optional()
 });
 
 // ../commons/src/events/test.utils.ts
-var import_lodash2 = require("lodash");
-var import_addDays = __toESM(require("date-fns/addDays"));
+var import_lodash3 = require("lodash");
+var import_date_fns3 = require("date-fns");
 
 // ../commons/src/field-config/field-configuration.ts
 function createFieldConfig(fieldId, options) {
@@ -4819,7 +4924,7 @@ var PRINT_CERTIFICATE_FORM = defineActionForm({
 var TENNIS_CLUB_DECLARATION_REVIEW = {
   title: {
     id: "v2.event.tennis-club-membership.action.declare.form.review.title",
-    defaultMessage: "{applicant.name.firstname, select, __EMPTY__ {Member declaration} other {{applicant.name.surname, select, __EMPTY__ {Member declaration} other {Member declaration for {applicant.name.firstname} {applicant.name.surname}}}}}",
+    defaultMessage: "{applicant.name.firstname, select, __EMPTY__ {Member declaration} other {{applicant.name.surname, select, __EMPTY__ {Member declaration for {applicant.name.firstname}} other {Member declaration for {applicant.name.firstname} {applicant.name.surname}}}}}",
     description: "Title of the review page"
   },
   fields: [
@@ -4958,6 +5063,7 @@ var TENNIS_CLUB_DECLARATION_FORM = defineDeclarationForm({
           id: "applicant.address",
           type: "ADDRESS",
           required: true,
+          secured: true,
           conditionals: [],
           label: {
             defaultMessage: "Applicant's address",
@@ -6124,8 +6230,8 @@ var v2BirthEvent = defineConfig({
 });
 
 // ../commons/src/events/test.utils.ts
-var import_zod33 = require("zod");
-var TestUserRole = import_zod33.z.enum([
+var import_zod34 = require("zod");
+var TestUserRole = import_zod34.z.enum([
   "FIELD_AGENT",
   "LOCAL_REGISTRAR",
   "LOCAL_SYSTEM_ADMIN",
@@ -6280,7 +6386,11 @@ function eventPayloadGenerator(rng) {
       type: input.type ?? TENNIS_CLUB_MEMBERSHIP,
       id
     }),
-    draft: ({ eventId, actionType }, input = {}) => (0, import_lodash2.merge)(
+    draft: ({
+      eventId,
+      actionType,
+      annotation
+    }, input = {}) => (0, import_lodash3.merge)(
       {
         id: getUUID(),
         eventId,
@@ -6300,7 +6410,8 @@ function eventPayloadGenerator(rng) {
           },
           annotation: {
             "correction.requester.relationship": "ANOTHER_AGENT",
-            "correction.request.reason": "Child's name was incorrect"
+            "correction.request.reason": "Child's name was incorrect",
+            ...annotation
           },
           createdAt: (/* @__PURE__ */ new Date()).toISOString(),
           createdBy: "@todo",
@@ -6334,13 +6445,13 @@ function eventPayloadGenerator(rng) {
       notify: (eventId, input = {}) => {
         let declaration = input.declaration;
         if (!declaration) {
-          const partialDeclaration = (0, import_lodash2.omitBy)(
+          const partialDeclaration = (0, import_lodash3.omitBy)(
             generateActionDeclarationInput(
               tennisClubMembershipEvent,
               ActionType.DECLARE,
               rng
             ),
-            import_lodash2.isString
+            import_lodash3.isString
           );
           declaration = partialDeclaration;
         }
@@ -6490,17 +6601,18 @@ function generateActionDocument({
   configuration,
   action,
   rng = () => 0.1,
-  defaults = {}
+  defaults = {},
+  user: user2 = {}
 }) {
   const actionBase = {
     // Offset is needed so the createdAt timestamps for events, actions and drafts make logical sense in storybook tests.
     // @TODO: This should be fixed in the future.
     createdAt: new Date(Date.now() - 500).toISOString(),
-    createdBy: getUUID(),
+    createdBy: user2.id ?? getUUID(),
     createdByUserType: TokenUserType.Enum.user,
     createdByRole: TestUserRole.Enum.FIELD_AGENT,
     id: getUUID(),
-    createdAtLocation: "a45b982a-5c7b-4bd9-8fd8-a42d0994054c",
+    createdAtLocation: user2.primaryOfficeId ?? "a45b982a-5c7b-4bd9-8fd8-a42d0994054c",
     declaration: generateActionDeclarationInput(configuration, action, rng),
     annotation: {},
     status: ActionStatus.Accepted,
@@ -6515,7 +6627,7 @@ function generateActionDocument({
     case ActionType.DECLARE:
       return { ...actionBase, type: action };
     case ActionType.UNASSIGN:
-      return { ...actionBase, type: action, assignedTo: null };
+      return { ...actionBase, type: action };
     case ActionType.ASSIGN:
       return { ...actionBase, assignedTo: getUUID(), type: action };
     case ActionType.VALIDATE:
@@ -6554,13 +6666,14 @@ function generateActionDocument({
 function generateEventDocument({
   configuration,
   actions,
-  rng = () => 0.1
+  rng = () => 0.1,
+  user: user2
 }) {
   return {
     trackingId: getUUID(),
     type: configuration.id,
     actions: actions.map(
-      (action) => generateActionDocument({ configuration, action, rng })
+      (action) => generateActionDocument({ configuration, action, rng, user: user2 })
     ),
     // Offset is needed so the createdAt timestamps for events, actions and drafts make logical sense in storybook tests.
     // @TODO: This should be fixed in the future.
@@ -6628,7 +6741,7 @@ function createPrng(seed) {
     return state / MODULUS;
   };
 }
-function generateUuid(rng) {
+function generateUuid(rng = () => 0.1) {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
     const r = Math.floor(rng() * 16);
     const v = c === "x" ? r : r & 3 | 8;
@@ -6640,6 +6753,11 @@ function generateTrackingId(rng) {
   const trackingId = uuid.slice(0, 6).toUpperCase();
   return trackingId;
 }
+function generateRegistrationNumber(rng) {
+  const uuid = generateUuid(rng).replace(/-/g, "");
+  const registrationNumber = uuid.slice(0, 12).toUpperCase();
+  return registrationNumber;
+}
 function generateRandomSignature(rng) {
   return `/random-bucket/${generateUuid(rng)}.png`;
 }
@@ -6660,7 +6778,7 @@ var eventQueryDataGenerator = (overrides = {}, seed = 1) => {
     createdAtLocation: overrides.createdAtLocation ?? generateUuid(rng),
     updatedAtLocation: overrides.updatedAtLocation ?? generateUuid(rng),
     createdBySignature: overrides.createdBySignature ?? generateRandomSignature(rng),
-    updatedAt: overrides.updatedAt ?? (0, import_addDays.default)(new Date(createdAt), 1).toISOString(),
+    updatedAt: overrides.updatedAt ?? (0, import_date_fns3.addDays)(new Date(createdAt), 1).toISOString(),
     assignedTo: overrides.assignedTo ?? null,
     updatedBy: overrides.updatedBy ?? generateUuid(rng),
     updatedByUserRole: overrides.updatedByUserRole ?? "FIELD_AGENT",
@@ -6732,7 +6850,7 @@ function isFieldConfigDefaultValue(value) {
 }
 
 // ../commons/src/events/scopes.ts
-var import_lodash3 = require("lodash");
+var import_lodash4 = require("lodash");
 var CONFIG_GET_ALLOWED_SCOPES = [
   SCOPES.RECORD_DECLARE,
   SCOPES.RECORD_READ,
@@ -6816,19 +6934,19 @@ var WRITE_ACTION_SCOPES = [
   ...ACTION_ALLOWED_SCOPES[ActionType.PRINT_CERTIFICATE]
 ];
 function hasAnyOfScopes(a, b) {
-  return (0, import_lodash3.intersection)(a, b).length > 0;
+  return (0, import_lodash4.intersection)(a, b).length > 0;
 }
 
 // ../commons/src/events/serializers/user/deserializer.ts
-var import_zod34 = require("zod");
+var import_zod35 = require("zod");
 var UserWithPrimaryOffice = User.extend({
-  primaryOfficeId: import_zod34.z.string()
+  primaryOfficeId: import_zod35.z.string()
 });
 function userDeserializer(serializedUserField, user2) {
   if (typeof serializedUserField === "string") {
     return serializedUserField;
   }
-  if (serializedUserField.$userField === "name" || serializedUserField.$userField === "signatureFilename") {
+  if (serializedUserField.$userField === "name" || serializedUserField.$userField === "signature" || serializedUserField.$userField === "avatar") {
     throw new Error(
       `Deserializer for ${serializedUserField.$userField} is not implemented yet`
     );