Allow starting childs as possible recipients

frontend/src/employee-frontend/components/messages/MessageEditor.tsx

@@ -216,6 +216,7 @@ export default React.memo(function MessageEditor({
     receiversAsSelectorNode(
       defaultSender.value,
       availableReceivers,
+      i18n.messages.receiverSelection.starters,
       draftContent?.recipientIds
     )
   )
@@ -312,13 +313,20 @@ export default React.memo(function MessageEditor({
 
       const accountReceivers = receiversAsSelectorNode(
         sender.value,
-        availableReceivers
+        availableReceivers,
+        i18n.messages.receiverSelection.starters
       )
       if (accountReceivers) {
         setReceiverTree(accountReceivers)
       }
     },
-    [availableReceivers, message.type, selectedReceivers, updateMessage]
+    [
+      availableReceivers,
+      i18n.messages.receiverSelection.starters,
+      message.type,
+      selectedReceivers,
+      updateMessage
+    ]
   )
   const handleRecipientChange = useCallback(
     (recipients: SelectorNode[]) => {

frontend/src/employee-frontend/generated/api-clients/messaging.ts

@@ -30,6 +30,7 @@ import { UpdatableDraftContent } from 'lib-common/generated/api-types/messaging'
 import { client } from '../../api/client'
 import { createUrlSearchParams } from 'lib-common/api'
 import { deserializeJsonDraftContent } from 'lib-common/generated/api-types/messaging'
+import { deserializeJsonMessageReceiversResponse } from 'lib-common/generated/api-types/messaging'
 import { deserializeJsonMessageThread } from 'lib-common/generated/api-types/messaging'
 import { deserializeJsonPagedMessageCopies } from 'lib-common/generated/api-types/messaging'
 import { deserializeJsonPagedMessageThreads } from 'lib-common/generated/api-types/messaging'
@@ -208,7 +209,7 @@ export async function getReceiversForNewMessage(): Promise<MessageReceiversRespo
     url: uri`/employee/messages/receivers`.toString(),
     method: 'GET'
   })
-  return json
+  return json.map(e => deserializeJsonMessageReceiversResponse(e))
 }
 
 

frontend/src/employee-mobile-frontend/generated/api-clients/messaging.ts

@@ -28,6 +28,7 @@ import { UpdatableDraftContent } from 'lib-common/generated/api-types/messaging'
 import { client } from '../../client'
 import { createUrlSearchParams } from 'lib-common/api'
 import { deserializeJsonDraftContent } from 'lib-common/generated/api-types/messaging'
+import { deserializeJsonMessageReceiversResponse } from 'lib-common/generated/api-types/messaging'
 import { deserializeJsonMessageThread } from 'lib-common/generated/api-types/messaging'
 import { deserializeJsonPagedMessageThreads } from 'lib-common/generated/api-types/messaging'
 import { deserializeJsonPagedSentMessages } from 'lib-common/generated/api-types/messaging'
@@ -149,7 +150,7 @@ export async function getReceiversForNewMessage(): Promise<MessageReceiversRespo
     url: uri`/employee-mobile/messages/receivers`.toString(),
     method: 'GET'
   })
-  return json
+  return json.map(e => deserializeJsonMessageReceiversResponse(e))
 }
 
 

frontend/src/employee-mobile-frontend/messages/MessageEditor.tsx

@@ -149,14 +149,19 @@ export default React.memo(function MessageEditor({
             recipients: receiversAsSelectorNode(
               accountId,
               availableRecipients,
+              i18n.messages.messageEditor.starters,
               draft.recipientIds
             ),
             urgent: draft.urgent,
             title: draft.title,
             content: draft.content
           }
         : {
-            recipients: receiversAsSelectorNode(accountId, availableRecipients),
+            recipients: receiversAsSelectorNode(
+              accountId,
+              availableRecipients,
+              i18n.messages.messageEditor.starters
+            ),
             urgent: false,
             title: '',
             content: ''

frontend/src/lib-common/api-types/messaging.ts

@@ -2,12 +2,15 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
+import { JsonOf } from 'lib-common/json'
+import LocalDate from 'lib-common/local-date'
 import { UUID } from 'lib-common/types'
 
 import { MessageRecipientType } from '../generated/api-types/messaging'
 
 export type MessageReceiver =
-  | MessageReceiverBase // unit in area, or child, or citizen
+  | MessageReceiverBase // unit in area, or citizen
+  | MessageReceiverChild
   | MessageReceiverArea
   | MessageReceiverUnit
   | MessageReceiverGroup
@@ -18,6 +21,10 @@ interface MessageReceiverBase {
   type: MessageRecipientType
 }
 
+interface MessageReceiverChild extends MessageReceiverBase {
+  startDate: LocalDate | null
+}
+
 interface MessageReceiverArea extends MessageReceiverBase {
   receivers: MessageReceiverUnitInArea[]
 }
@@ -26,10 +33,12 @@ type MessageReceiverUnitInArea = MessageReceiverBase
 
 interface MessageReceiverUnit extends MessageReceiverBase {
   receivers: MessageReceiverGroup[]
+  hasStarters: boolean
 }
 
 interface MessageReceiverGroup extends MessageReceiverBase {
   receivers: MessageReceiverBase[]
+  hasStarters: boolean
 }
 
 export const sortReceivers = (
@@ -47,6 +56,55 @@ export const sortReceivers = (
           }
         : receiver
     )
-    .sort((a, b) =>
-      a.name.toLocaleLowerCase().localeCompare(b.name.toLocaleLowerCase())
-    )
+    .sort((a, b) => {
+      const aStarter = messageReceiverIsStarter(a) ? 1 : 0
+      const bStarter = messageReceiverIsStarter(b) ? 1 : 0
+
+      if (aStarter !== bStarter) {
+        return aStarter - bStarter
+      }
+
+      const aDate = messageReceiverStartDate(a)
+      const bDate = messageReceiverStartDate(b)
+
+      if (aDate && bDate) {
+        if (aDate.isBefore(bDate)) return -1
+        if (aDate.isAfter(bDate)) return 1
+      } else if (aDate && !bDate) {
+        return -1
+      } else if (!aDate && bDate) {
+        return 1
+      }
+      return a.name
+        .toLocaleLowerCase()
+        .localeCompare(b.name.toLocaleLowerCase())
+    })
+
+export function messageReceiverStartDate(
+  receiver: MessageReceiver
+): LocalDate | null {
+  return 'startDate' in receiver ? receiver.startDate : null
+}
+
+export function messageReceiverIsStarter(receiver: MessageReceiver): boolean {
+  return (
+    ('hasStarters' in receiver && receiver.hasStarters) ||
+    messageReceiverStartDate(receiver) !== null
+  )
+}
+
+export function deserializeMessageReceiver(
+  json: JsonOf<MessageReceiver>
+): MessageReceiver {
+  const result: MessageReceiver = {
+    ...json,
+    ...('startDate' in json && {
+      startDate:
+        json.startDate !== null ? LocalDate.parseIso(json.startDate) : null
+    }),
+    ...('receivers' in json && {
+      receivers: json.receivers.map(deserializeMessageReceiver)
+    })
+  }
+  return result
+}

frontend/src/lib-common/generated/api-types/messaging.ts

@@ -20,6 +20,7 @@ import { MessageId } from './shared'
 import { MessageReceiver } from '../../api-types/messaging'
 import { MessageThreadId } from './shared'
 import { PersonId } from './shared'
+import { deserializeMessageReceiver } from '../../api-types/messaging'
 
 /**
 * Generated from fi.espoo.evaka.messaging.AccountType
@@ -471,6 +472,14 @@ export function deserializeJsonMessageCopy(json: JsonOf<MessageCopy>): MessageCo
 }
 
 
+export function deserializeJsonMessageReceiversResponse(json: JsonOf<MessageReceiversResponse>): MessageReceiversResponse {
+  return {
+    ...json,
+    receivers: json.receivers.map(e => deserializeMessageReceiver(e))
+  }
+}
+
+
 export function deserializeJsonMessageThread(json: JsonOf<MessageThread>): MessageThread {
   return {
     ...json,

frontend/src/lib-components/messages/SelectorNode.ts

@@ -2,7 +2,11 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-import { MessageReceiver } from 'lib-common/api-types/messaging'
+import {
+  MessageReceiver,
+  messageReceiverIsStarter,
+  messageReceiverStartDate
+} from 'lib-common/api-types/messaging'
 import {
   MessageReceiversResponse,
   MessageRecipient
@@ -27,6 +31,7 @@ export interface SelectorNode extends TreeNode {
 export const receiversAsSelectorNode = (
   accountId: UUID,
   receivers: MessageReceiversResponse[],
+  starterTranslation: string,
   checkedIds: UUID[] = []
 ): SelectorNode[] => {
   const accountReceivers = receivers.find(
@@ -36,9 +41,9 @@ export const receiversAsSelectorNode = (
   if (!accountReceivers) {
     return []
   }
-
-  const selectorNodes = accountReceivers.map(receiverAsSelectorNode)
-
+  const selectorNodes = accountReceivers.map((r) =>
+    receiverAsSelectorNode(r, starterTranslation)
+  )
   if (selectorNodes.length === 1 && selectorNodes[0].children.length === 0) {
     return selectorNodes.map((node) => ({ ...node, checked: true }))
   }
@@ -67,16 +72,28 @@ function checkAll(node: SelectorNode): SelectorNode {
   return { ...node, checked: true, children: node.children.map(checkAll) }
 }
 
-const receiverAsSelectorNode = (receiver: MessageReceiver): SelectorNode => ({
-  key: receiver.id,
-  checked: false,
-  text: receiver.name,
-  messageRecipient: { type: receiver.type, id: receiver.id },
-  children:
-    'receivers' in receiver
-      ? receiver.receivers.map(receiverAsSelectorNode)
-      : []
-})
+function receiverAsSelectorNode(
+  receiver: MessageReceiver,
+  starterTranslation: string
+): SelectorNode {
+  const startDate = messageReceiverStartDate(receiver)
+  const isStarter = messageReceiverIsStarter(receiver)
+  const nameWithStarterIndication = isStarter
+    ? `${receiver.name} (${startDate?.format() ?? starterTranslation})`
+    : receiver.name
+  return {
+    key: `${receiver.id}-${isStarter}`,
+    checked: false,
+    text: nameWithStarterIndication,
+    messageRecipient: { type: receiver.type, id: receiver.id },
+    children:
+      'receivers' in receiver
+        ? receiver.receivers.map((r) =>
+            receiverAsSelectorNode(r, starterTranslation)
+          )
+        : []
+  }
+}
 
 export type SelectedNode = {
   key: UUID

frontend/src/lib-customizations/defaults/employee-mobile-frontend/i18n/fi.ts

@@ -444,6 +444,7 @@ export const fi = {
       sender: 'Lähettäjä',
       receivers: 'Vastaanottajat',
       recipientsPlaceholder: 'Valitse...',
+      starters: 'aloittavat',
       subject: {
         heading: 'Otsikko',
         placeholder: 'Kirjoita...'

frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx

@@ -4587,7 +4587,8 @@ export const fi = {
       childName: 'Nimi',
       childDob: 'Syntymäaika',
       receivers: 'Vastaanottajat',
-      confirmText: 'Lähetä viesti valituille'
+      confirmText: 'Lähetä viesti valituille',
+      starters: 'aloittavat'
     },
     noTitle: 'Ei otsikkoa',
     notSent: 'Ei lähetetty',

service/codegen/src/main/kotlin/evaka/codegen/api/Config.kt

@@ -61,6 +61,8 @@ object Imports {
     val vasuQuestion = TsImport.Named(LibCommon / "api-types/vasu.ts", "VasuQuestion")
     val mapVasuQuestion = TsImport.Named(LibCommon / "api-types/vasu.ts", "mapVasuQuestion")
     val messageReceiver = TsImport.Named(LibCommon / "api-types/messaging.ts", "MessageReceiver")
+    val deserializeMessageReceiver =
+        TsImport.Named(LibCommon / "api-types/messaging.ts", "deserializeMessageReceiver")
     val uuid = TsImport.Named(LibCommon / "types.d.ts", "UUID")
     val action = TsImport.Named(LibCommon / "generated/action.ts", "Action")
     val jsonOf = TsImport.Named(LibCommon / "json.d.ts", "JsonOf")
@@ -184,7 +186,9 @@ val defaultMetadata =
             TsExternalTypeRef(
                 "MessageReceiver",
                 keyRepresentation = null,
-                deserializeJson = null,
+                deserializeJson = { json ->
+                    TsCode { "${ref(Imports.deserializeMessageReceiver)}(${inline(json)})" }
+                },
                 serializePathVariable = null,
                 serializeRequestParam = null,
                 Imports.messageReceiver,

service/src/integrationTest/kotlin/fi/espoo/evaka/messaging/MessageReceiversIntegrationTest.kt

@@ -128,17 +128,20 @@ class MessageReceiversIntegrationTest : FullApplicationTest(resetDbBeforeEach =
                             MessageReceiver.Unit(
                                 id = daycare1.id,
                                 name = daycare1.name,
+                                hasStarters = false,
                                 receivers =
                                     listOf(
                                         MessageReceiver.Group(
                                             id = group1.id,
                                             name = group1.name,
+                                            hasStarters = false,
                                             receivers =
                                                 listOf(
                                                     MessageReceiver.Child(
                                                         id = child1.id,
                                                         name =
                                                             "${child1.lastName} ${child2.firstName}",
+                                                        startDate = null,
                                                     )
                                                 ),
                                         )
@@ -153,11 +156,13 @@ class MessageReceiversIntegrationTest : FullApplicationTest(resetDbBeforeEach =
                             MessageReceiver.Group(
                                 id = group1.id,
                                 name = group1.name,
+                                hasStarters = false,
                                 receivers =
                                     listOf(
                                         MessageReceiver.Child(
                                             id = child1.id,
                                             name = "${child1.lastName} ${child1.firstName}",
+                                            startDate = null,
                                         )
                                     ),
                             )
@@ -182,17 +187,20 @@ class MessageReceiversIntegrationTest : FullApplicationTest(resetDbBeforeEach =
                             MessageReceiver.Unit(
                                 id = daycare2.id,
                                 name = daycare2.name,
+                                hasStarters = false,
                                 receivers =
                                     listOf(
                                         MessageReceiver.Group(
                                             id = group2.id,
                                             name = group2.name,
+                                            hasStarters = false,
                                             receivers =
                                                 listOf(
                                                     MessageReceiver.Child(
                                                         id = child2.id,
                                                         name =
                                                             "${child2.lastName} ${child2.firstName}",
+                                                        startDate = null,
                                                     )
                                                 ),
                                         )