Merge remote-tracking branch 'origin/develop' into ocrvs-6213

opencrvs · Jan 3, 2025 · 8a0b37d · 8a0b37d
2 parents c858385 + 2a80871
commit 8a0b37d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 264 deletions.
diff --git a/packages/commons/src/events/ActionDocument.ts b/packages/commons/src/events/ActionDocument.ts
@@ -14,6 +14,7 @@ import { z } from 'zod'
 const ActionBase = z.object({
   createdAt: z.string().datetime(),
   createdBy: z.string(),
+  createdAtLocation: z.string(),
   data: z.record(z.string(), z.any())
 })
 
@@ -60,15 +61,13 @@ const DraftAction = ActionBase.merge(
 
 const CreatedAction = ActionBase.merge(
   z.object({
-    type: z.literal(ActionType.CREATE),
-    createdAtLocation: z.string()
+    type: z.literal(ActionType.CREATE)
   })
 )
 
 const NotifiedAction = ActionBase.merge(
   z.object({
-    type: z.literal(ActionType.NOTIFY),
-    createdAtLocation: z.string()
+    type: z.literal(ActionType.NOTIFY)
   })
 )
 

diff --git a/packages/events/src/router/router.ts b/packages/events/src/router/router.ts
@@ -112,19 +112,22 @@ export const appRouter = router({
       notify: publicProcedure.input(NotifyActionInput).mutation((options) => {
         return addAction(options.input, {
           eventId: options.input.eventId,
-          createdBy: options.ctx.user.id
+          createdBy: options.ctx.user.id,
+          createdAtLocation: options.ctx.user.primaryOfficeId
         })
       }),
       draft: publicProcedure.input(DraftActionInput).mutation((options) => {
         return addAction(options.input, {
           eventId: options.input.eventId,
-          createdBy: options.ctx.user.id
+          createdBy: options.ctx.user.id,
+          createdAtLocation: options.ctx.user.primaryOfficeId
         })
       }),
       declare: publicProcedure.input(DeclareActionInput).mutation((options) => {
         return addAction(options.input, {
           eventId: options.input.eventId,
-          createdBy: options.ctx.user.id
+          createdBy: options.ctx.user.id,
+          createdAtLocation: options.ctx.user.primaryOfficeId
         })
       }),
       register: publicProcedure
@@ -140,7 +143,8 @@ export const appRouter = router({
             },
             {
               eventId: options.input.eventId,
-              createdBy: options.ctx.user.id
+              createdBy: options.ctx.user.id,
+              createdAtLocation: options.ctx.user.primaryOfficeId
             }
           )
         })

diff --git a/packages/events/src/service/events.ts b/packages/events/src/service/events.ts
@@ -101,7 +101,11 @@ export async function createEvent({
 
 export async function addAction(
   input: ActionInput,
-  { eventId, createdBy }: { eventId: string; createdBy: string }
+  {
+    eventId,
+    createdBy,
+    createdAtLocation
+  }: { eventId: string; createdBy: string; createdAtLocation: string }
 ) {
   const db = await getClient()
   const now = new Date().toISOString()
@@ -115,7 +119,8 @@ export async function addAction(
         actions: {
           ...input,
           createdBy,
-          createdAt: now
+          createdAt: now,
+          createdAtLocation
         }
       }
     }

diff --git a/packages/gateway/src/graphql/config.ts b/packages/gateway/src/graphql/config.ts
@@ -18,8 +18,6 @@ import {
 } from 'graphql'
 
 import { ApolloServerOptions } from '@apollo/server'
-import { resolvers as eventsV2Resolvers } from '@gateway/v2-events/events/root-resolvers'
-import { eventResolvers as eventsV2TypeResolvers } from '@gateway/v2-events/events/type-resolvers'
 import { resolvers as bookmarkAdvancedSearchResolvers } from '@gateway/features/bookmarkAdvancedSearch/root-resolvers'
 import { resolvers as correctionRootResolvers } from '@gateway/features/correction/root-resolvers'
 import { resolvers as locationRootResolvers } from '@gateway/features/location/root-resolvers'
@@ -61,8 +59,6 @@ interface IStringIndexSignatureInterface {
 type StringIndexed<T> = T & IStringIndexSignatureInterface
 
 export const resolvers: StringIndexed<IResolvers> = merge(
-  eventsV2Resolvers,
-  eventsV2TypeResolvers,
   notificationRootResolvers as IResolvers,
   registrationRootResolvers as IResolvers,
   locationRootResolvers as IResolvers,

diff --git a/packages/gateway/src/graphql/index.graphql b/packages/gateway/src/graphql/index.graphql
@@ -19,8 +19,6 @@
 # import Mutation.* from '../features/systems/schema.graphql'
 # import Query.* from '../features/systems/schema.graphql'
 # import Mutation from '../features/bookmarkAdvancedSearch/schema.graphql'
-# import Mutation.* from '../v2-events/events/schema.graphql'
-# import Query.* from '../v2-events/events/schema.graphql'
 # import * from 'common.graphql'
 
 # TODO

diff --git a/packages/gateway/src/v2-events/events/root-resolvers.ts b/packages/gateway/src/v2-events/events/root-resolvers.ts
diff --git a/packages/gateway/src/v2-events/events/schema.graphql b/packages/gateway/src/v2-events/events/schema.graphql
diff --git a/packages/gateway/src/v2-events/events/type-resolvers.ts b/packages/gateway/src/v2-events/events/type-resolvers.ts