Rewrites subpoena info diff

apps/judicial-system/backend/src/app/modules/police/index.ts

@@ -1,5 +1,6 @@
 export {
   PoliceDocumentType,
   PoliceDocument,
+  SubpoenaInfo,
   PoliceService,
 } from './police.service'

apps/judicial-system/backend/src/app/modules/police/police.service.ts

@@ -39,7 +39,6 @@ import { UploadPoliceCaseFileDto } from './dto/uploadPoliceCaseFile.dto'
 import { CreateSubpoenaResponse } from './models/createSubpoena.response'
 import { PoliceCaseFile } from './models/policeCaseFile.model'
 import { PoliceCaseInfo } from './models/policeCaseInfo.model'
-import { SubpoenaInfo } from './models/subpoenaInfo.model'
 import { UploadPoliceCaseFileResponse } from './models/uploadPoliceCaseFile.response'
 import { policeModuleConfig } from './police.config'
 
@@ -59,6 +58,14 @@ export interface PoliceDocument {
   courtDocument: string
 }
 
+export interface SubpoenaInfo {
+  serviceStatus?: ServiceStatus
+  comment?: string
+  servedBy?: string
+  defenderNationalId?: string
+  serviceDate?: Date
+}
+
 const getChapter = (category?: string): number | undefined => {
   if (!category) {
     return undefined

apps/judicial-system/backend/src/app/modules/subpoena/subpoena.service.ts

@@ -35,7 +35,7 @@ import { DefendantService } from '../defendant/defendant.service'
 import { Defendant } from '../defendant/models/defendant.model'
 import { EventService } from '../event'
 import { FileService } from '../file'
-import { PoliceService } from '../police'
+import { PoliceService, SubpoenaInfo } from '../police'
 import { User } from '../user'
 import { UpdateSubpoenaDto } from './dto/updateSubpoena.dto'
 import { DeliverResponse } from './models/deliver.response'
@@ -59,6 +59,27 @@ export const include: Includeable[] = [
   { model: Defendant, as: 'defendant' },
 ]
 
+const subpoenaInfoKeys: Array<keyof SubpoenaInfo> = [
+  'serviceStatus',
+  'comment',
+  'servedBy',
+  'defenderNationalId',
+  'serviceDate',
+]
+
+const isNewValueSetAndDifferent = (
+  newValue: unknown,
+  oldValue: unknown,
+): boolean => Boolean(newValue) && newValue !== oldValue
+
+export const isSubpoenaInfoChanged = (
+  newSubpoenaInfo: SubpoenaInfo,
+  oldSubpoenaInfo: SubpoenaInfo,
+) =>
+  subpoenaInfoKeys.some((key) =>
+    isNewValueSetAndDifferent(newSubpoenaInfo[key], oldSubpoenaInfo[key]),
+  )
+
 @Injectable()
 export class SubpoenaService {
   constructor(
@@ -353,7 +374,7 @@ export class SubpoenaService {
       user,
     )
 
-    if (!subpoenaInfo.isSubpoenaInfoChanged(subpoena)) {
+    if (!isSubpoenaInfoChanged(subpoenaInfo, subpoena)) {
       // The subpoena has not changed
       return subpoena
     }