♻️ simulation upsert informations on event

Author: paulsouche

src/features/groups/groups.repository.ts

@@ -71,7 +71,7 @@ export const createGroupAndUser = async (
   const [participantDto] = participants || []
 
   // For now no relation
-  const [group, simulation] = await Promise.all([
+  const [group, simulationCreation] = await Promise.all([
     // create group
     session.group.create({
       data: {
@@ -111,7 +111,11 @@ export const createGroupAndUser = async (
       : []),
   ])
 
+  const { created, simulation, updated } = simulationCreation || {}
+
   return {
+    simulationUpdated: updated,
+    simulationCreated: created,
     administrator,
     simulation,
     group: {
@@ -185,7 +189,7 @@ export const createParticipantAndUser = async (
 
   // For now no relation
   const { id: simulationId } = simulationDto
-  const [simulation, participant] = await Promise.all([
+  const [simulationCreation, participant] = await Promise.all([
     createParticipantSimulation(
       {
         userId,
@@ -217,11 +221,19 @@ export const createParticipantAndUser = async (
     }),
   ])
 
+  const {
+    created: simulationCreated,
+    simulation,
+    updated: simulationUpdated,
+  } = simulationCreation
+
   return {
     participant: {
       ...participant,
       simulation,
     },
+    simulationUpdated,
+    simulationCreated,
     created: !existingParticipant,
     updated: !!existingParticipant,
   }

src/features/groups/groups.service.ts

@@ -106,9 +106,13 @@ export const createGroup = async ({
   groupDto: GroupCreateDto
   origin: string
 }) => {
-  const { group, administrator, simulation } = await transaction((session) =>
-    createGroupAndUser(groupDto, { session })
-  )
+  const {
+    group,
+    administrator,
+    simulation,
+    simulationUpdated,
+    simulationCreated,
+  } = await transaction((session) => createGroupAndUser(groupDto, { session }))
   const { participants } = group
 
   const events = []
@@ -130,6 +134,8 @@ export const createGroup = async ({
       administrator,
       sendEmail: true,
       user: administrator,
+      updated: simulationUpdated,
+      created: simulationCreated,
     })
 
     EventBus.emit(simulationUpsertedEvent)
@@ -180,9 +186,10 @@ export const createParticipant = async ({
   participantDto: ParticipantCreateDto
 }) => {
   try {
-    const { participant, created } = await transaction((session) =>
-      createParticipantAndUser(params, participantDto, { session })
-    )
+    const { participant, created, simulationCreated, simulationUpdated } =
+      await transaction((session) =>
+        createParticipantAndUser(params, participantDto, { session })
+      )
     const {
       user,
       group,
@@ -198,6 +205,8 @@ export const createParticipant = async ({
     })
 
     const simulationUpsertedEvent = new SimulationUpsertedEvent({
+      created: simulationCreated,
+      updated: simulationUpdated,
       sendEmail: created,
       administrator,
       simulation,

src/features/simulations/events/SimulationUpserted.event.ts

@@ -3,46 +3,39 @@ import { EventBusEvent } from '../../../core/event-bus/event'
 import type { ModelToDto } from '../../../types/types'
 import type { SimulationCreateNewsletterList } from '../simulations.validator'
 
-type SimulationAttributes =
-  | {
-      origin: string
-      user: Pick<User, 'id' | 'name' | 'email'>
-      simulation: Pick<
-        Simulation,
-        'id' | 'progression' | 'actionChoices' | 'computedResults' | 'date'
-      >
-      group?: undefined
-      administrator?: undefined
-      organisation?: undefined
-      newsletters: SimulationCreateNewsletterList
-      sendEmail: boolean
-    }
-  | {
-      origin: string
-      user: Pick<User, 'id' | 'name' | 'email'>
-      simulation: Pick<
-        Simulation,
-        'id' | 'progression' | 'actionChoices' | 'computedResults' | 'date'
-      >
-      group: Pick<Group, 'id' | 'name'>
-      administrator: Pick<User, 'id'>
-      organisation?: undefined
-      newsletters?: undefined
-      sendEmail: boolean
-    }
-  | {
-      origin: string
-      user: Pick<User, 'id' | 'name' | 'email'>
-      simulation: Pick<
-        Simulation,
-        'id' | 'progression' | 'actionChoices' | 'computedResults' | 'date'
-      >
-      group?: undefined
-      administrator?: undefined
-      organisation: Pick<Organisation, 'name' | 'slug'>
-      newsletters?: undefined
-      sendEmail: boolean
-    }
+type BaseSimulationUpsertedEventAttributes = {
+  origin: string
+  user: Pick<User, 'id' | 'name' | 'email'>
+  simulation: Pick<
+    Simulation,
+    'id' | 'progression' | 'actionChoices' | 'computedResults' | 'date'
+  >
+  sendEmail: boolean
+  created: boolean
+  updated: boolean
+}
+
+type SimulationAttributes = BaseSimulationUpsertedEventAttributes &
+  (
+    | {
+        group?: undefined
+        administrator?: undefined
+        organisation?: undefined
+        newsletters: SimulationCreateNewsletterList
+      }
+    | {
+        group: Pick<Group, 'id' | 'name'>
+        administrator: Pick<User, 'id'>
+        organisation?: undefined
+        newsletters?: undefined
+      }
+    | {
+        group?: undefined
+        administrator?: undefined
+        organisation: Pick<Organisation, 'name' | 'slug'>
+        newsletters?: undefined
+      }
+  )
 
 export class SimulationUpsertedEvent extends EventBusEvent<SimulationAttributes> {
   name = 'SimulationUpsertedEvent'

src/features/simulations/simulations.repository.ts

@@ -54,7 +54,7 @@ export const createUserSimulation = async (
   )
 }
 
-export const createParticipantSimulation = <
+export const createParticipantSimulation = async <
   T extends
     Prisma.SimulationSelect = typeof defaultSimulationSelectionWithoutUser,
 >(
@@ -80,69 +80,63 @@ export const createParticipantSimulation = <
   },
   { session }: { session: Session }
 ) => {
-  return session.simulation.upsert({
+  const existingSimulation = await session.simulation.findUnique({
     where: {
       id,
     },
-    create: {
-      id,
-      date,
-      model,
-      userId,
-      situation,
-      foldedSteps,
-      progression,
-      actionChoices,
-      savedViaEmail,
-      computedResults,
-      ...(!!additionalQuestionsAnswers?.length
-        ? {
-            additionalQuestionsAnswers: {
-              createMany: {
-                data: additionalQuestionsAnswers.map(
-                  ({ type, key, answer }) => ({
-                    type,
-                    key,
-                    answer,
-                  })
-                ),
-              },
-            },
-          }
-        : {}),
-    },
-    update: {
-      id,
-      date,
-      model,
-      userId,
-      situation,
-      foldedSteps,
-      progression,
-      actionChoices,
-      savedViaEmail,
-      computedResults,
-      additionalQuestionsAnswers: {
-        deleteMany: {
-          simulationId: id,
-        },
-        ...(!!additionalQuestionsAnswers?.length
-          ? {
-              createMany: {
-                data: additionalQuestionsAnswers.map(
-                  ({ type, key, answer }) => ({
-                    type,
-                    key,
-                    answer,
-                  })
-                ),
-              },
-            }
-          : {}),
-      },
+    select: {
+      id: true,
     },
-    select,
   })
+
+  const payload = {
+    date,
+    model,
+    userId,
+    situation,
+    foldedSteps,
+    progression,
+    actionChoices,
+    savedViaEmail,
+    computedResults,
+    ...(!!additionalQuestionsAnswers?.length
+      ? {
+          additionalQuestionsAnswers: {
+            createMany: {
+              data: additionalQuestionsAnswers.map(({ type, key, answer }) => ({
+                type,
+                key,
+                answer,
+              })),
+            },
+          },
+        }
+      : {}),
+  }
+
+  const simulation = !!existingSimulation
+    ? await session.simulation.update({
+        where: {
+          id,
+        },
+        data: {
+          ...payload,
+        },
+        select,
+      })
+    : await session.simulation.create({
+        data: {
+          id,
+          ...payload,
+        },
+        select,
+      })
+
+  return {
+    simulation,
+    created: !existingSimulation,
+    updated: !!existingSimulation,
+  }
 }
 
 export const fetchUserSimulations = (
@@ -211,11 +205,11 @@ export const createPollUserSimulation = async (
     select: { id: true },
   })
 
-  const { id: simulationId } = await createUserSimulation(
-    params,
-    simulationDto,
-    { session }
-  )
+  const {
+    simulation: { id: simulationId },
+    created: simulationCreated,
+    updated: simulationUpdated,
+  } = await createUserSimulation(params, simulationDto, { session })
 
   const relation = {
     pollId,
@@ -254,8 +248,10 @@ export const createPollUserSimulation = async (
   }
 
   return {
-    simulation,
     poll,
+    simulation,
+    simulationCreated,
+    simulationUpdated,
     created: !existingParticipation,
     updated: !!existingParticipation,
   }

src/features/simulations/simulations.service.ts

@@ -71,7 +71,7 @@ export const createSimulation = async ({
   params: UserParams
   origin: string
 }) => {
-  const simulation = await transaction((session) =>
+  const { simulation, created, updated } = await transaction((session) =>
     createUserSimulation(params, simulationDto, { session })
   )
   const { user } = simulation
@@ -80,6 +80,8 @@ export const createSimulation = async ({
     newsletters,
     simulation,
     sendEmail,
+    created,
+    updated,
     origin,
     user,
   })
@@ -126,9 +128,10 @@ export const createPollSimulation = async ({
   simulationDto: SimulationCreateDto
 }) => {
   try {
-    const { poll, simulation, created } = await transaction((session) =>
-      createPollUserSimulation(params, simulationDto, { session })
-    )
+    const { poll, simulation, simulationCreated, simulationUpdated, created } =
+      await transaction((session) =>
+        createPollUserSimulation(params, simulationDto, { session })
+      )
     const { user } = simulation
     const { organisation } = poll
 
@@ -138,6 +141,8 @@ export const createPollSimulation = async ({
     })
 
     const simulationUpsertedEvent = new SimulationUpsertedEvent({
+      created: simulationCreated,
+      updated: simulationUpdated,
       sendEmail: created,
       organisation,
       simulation,