refactor: remove the deprecated "shared" package

.github/workflows/codeql-analysis.yml

@@ -18,7 +18,6 @@ on:
       - frontend/**
       - queue/**
       - server/**
-      - shared/**
       - packages/**
   pull_request:
     # The branches below must be a subset of the branches above
@@ -27,7 +26,6 @@ on:
       - frontend/**
       - queue/**
       - server/**
-      - shared/**
       - packages/**
   schedule:
     - cron: '21 21 * * 4'

.github/workflows/github-actions.yml

@@ -6,7 +6,6 @@ on:
       - frontend/**
       - queue/**
       - server/**
-      - shared/**
       - packages/**
 
 jobs:

.sonarcloud.properties

@@ -1,6 +1,6 @@
 sonar.projectKey=zero-logement-vacant
 
-sonar.sources = frontend/src,scripts,server,shared
+sonar.sources = frontend/src,scripts,server
 sonar.exclusions = **/*.test.ts,**/*.test.tsx,shared/utils/http-request.ts
 
 sonar.cpd.exclusions=frontend/src/components/RichEditor/variable-options.ts

.talismanrc

@@ -13,14 +13,8 @@ fileignoreconfig:
   checksum: 459ad7c52a09b1a5d885f0e13acd68a894b862470125529ecc28a4116c737df7
 - filename: server/src/services/ceremaService/ceremaService.ts
   checksum: 2005ee48d86de2c6e6e57b187862cdeaafcb9f0c49e9a82ec7031910957174e8
-scopeconfig:
-- scope: node
-allowed_patterns:
-- keyof
-- \[key\]
-- key=
-version: "1.0"
-7a4a8a18e745712b39198d93a5
+- filename: server/src/utils/validators.ts
+  checksum: 0e66a928db0199f1ce82d1c52d1b6c8e6695b26cbbd35f50d8a655d1f1d8fd75
 scopeconfig:
 - scope: node
 allowed_patterns:

frontend/src/components/Campaign/CampaignStatusBadge.tsx

@@ -1,5 +1,5 @@
 import AppBadge from '../_app/AppBadge/AppBadge';
-import { CampaignStatus } from '../../../../shared';
+import { CampaignStatus } from '@zerologementvacant/models';
 
 interface Props {
   status: CampaignStatus;

frontend/src/components/modals/HousingCreationModal/ReviewHousing.tsx

@@ -6,7 +6,7 @@ import { OccupancyKind } from '../../../models/Housing';
 import { Text } from '../../_dsfr';
 import { useCreateHousingMutation } from '../../../services/housing.service';
 import { datafoncierApi } from '../../../services/datafoncier.service';
-import { DatafoncierHousing } from '../../../../../shared';
+import { DatafoncierHousing } from '@zerologementvacant/models';
 import { useAppSelector } from '../../../hooks/useStore';
 import { Step, StepProps } from '../ModalStepper/ModalGraphStepper';
 
@@ -15,7 +15,7 @@ const ReviewHousing = forwardRef((props: StepProps, ref) => {
   const { localId } = creator;
   const { data: datafoncierHousing } = datafoncierApi.useFindOneHousingQuery(
     localId as string,
-    { skip: !localId },
+    { skip: !localId }
   );
 
   const address = datafoncierHousing
@@ -35,7 +35,7 @@ const ReviewHousing = forwardRef((props: StepProps, ref) => {
       } catch {
         return null;
       }
-    },
+    }
   }));
 
   return (
@@ -60,7 +60,7 @@ ReviewHousing.displayName = 'ReviewHousing';
 
 const step: Step = {
   id: 'review-housing',
-  Component: ReviewHousing,
+  Component: ReviewHousing
 };
 
 function toAddress(housing: DatafoncierHousing): string {

frontend/src/models/Campaign.tsx

@@ -1,6 +1,6 @@
 import { dateSort } from '../utils/dateUtils';
 import { Sort } from './Sort';
-import { CampaignDTO, CampaignStatus } from '../../../shared';
+import { CampaignDTO, CampaignStatus } from '@zerologementvacant/models';
 
 export interface Campaign extends CampaignDTO {
   exportURL: string;
@@ -14,7 +14,7 @@ export enum CampaignSteps {
   Confirmation,
   InProgress,
   Outside,
-  Archived,
+  Archived
 }
 
 export function isBuilding(campaign: Campaign) {
@@ -26,14 +26,14 @@ export const campaignStep = (campaign: Campaign) => {
   return !campaign?.validatedAt
     ? CampaignSteps.OwnersValidation
     : !campaign?.exportedAt
-    ? CampaignSteps.Export
-    : !campaign?.sentAt
-    ? CampaignSteps.Sending
-    : campaign?.archivedAt
-    ? CampaignSteps.Archived
-    : !campaign?.confirmedAt
-    ? CampaignSteps.Confirmation
-    : CampaignSteps.InProgress;
+      ? CampaignSteps.Export
+      : !campaign?.sentAt
+        ? CampaignSteps.Sending
+        : campaign?.archivedAt
+          ? CampaignSteps.Archived
+          : !campaign?.confirmedAt
+            ? CampaignSteps.Confirmation
+            : CampaignSteps.InProgress;
 };
 
 export type CampaignSortable = Pick<Campaign, 'createdAt' | 'sentAt'> & {

frontend/src/models/Housing.tsx

@@ -5,6 +5,7 @@ import {
   EnergyConsumption,
   HousingDTO,
   HousingKind,
+  HousingSource,
   HousingStatus,
   INTERNAL_CO_CONDOMINIUM_VALUES,
   INTERNAL_MONO_CONDOMINIUM_VALUES,
@@ -16,7 +17,6 @@ import { Sort } from './Sort';
 import { LocalityKinds } from './Locality';
 import { Note } from './Note';
 import { Compare } from '../utils/compareUtils';
-import { HousingSource } from '../../../shared';
 
 export interface Housing {
   id: string;

frontend/src/services/contact-point.service.ts

@@ -1,4 +1,4 @@
-import { ContactPoint, DraftContactPoint } from '../../../shared';
+import { ContactPoint, DraftContactPoint } from '@zerologementvacant/models';
 import { zlvApi } from './api.service';
 
 export const contactPointsApi = zlvApi.injectEndpoints({
@@ -19,45 +19,43 @@ export const contactPointsApi = zlvApi.injectEndpoints({
           ? [
               ...result.map(({ id }) => ({
                 type: 'ContactPoint' as const,
-                id,
+                id
               })),
-              'ContactPoint',
+              'ContactPoint'
             ]
-          : ['ContactPoint'],
+          : ['ContactPoint']
     }),
     createContactPoint: builder.mutation<void, DraftContactPoint>({
       query: (draftContactPoint) => ({
         url: 'contact-points',
         method: 'POST',
-        body: draftContactPoint,
+        body: draftContactPoint
       }),
-      invalidatesTags: ['ContactPoint'],
+      invalidatesTags: ['ContactPoint']
     }),
     updateContactPoint: builder.mutation<void, ContactPoint>({
       query: ({ id, ...body }) => ({
         url: `contact-points/${id}`,
         method: 'PUT',
-        body,
+        body
       }),
-      invalidatesTags: (result, error, { id }) => [
-        { type: 'ContactPoint', id },
-      ],
+      invalidatesTags: (result, error, { id }) => [{ type: 'ContactPoint', id }]
     }),
     removeContactPoint: builder.mutation<void, string>({
       query: (contactPointId) => ({
         url: `contact-points/${contactPointId}`,
-        method: 'DELETE',
+        method: 'DELETE'
       }),
       invalidatesTags: (result, error, contactPointId) => [
-        { type: 'ContactPoint', contactPointId },
-      ],
-    }),
-  }),
+        { type: 'ContactPoint', contactPointId }
+      ]
+    })
+  })
 });
 
 export const {
   useCreateContactPointMutation,
   useUpdateContactPointMutation,
   useFindContactPointsQuery,
-  useRemoveContactPointMutation,
+  useRemoveContactPointMutation
 } = contactPointsApi;

frontend/src/services/datafoncier.service.ts

@@ -1,4 +1,4 @@
-import { DatafoncierHousing } from '../../../shared';
+import { DatafoncierHousing } from '@zerologementvacant/models';
 import { getURLQuery } from '../utils/fetchUtils';
 import { zlvApi } from './api.service';
 
@@ -9,15 +9,15 @@ export const datafoncierApi = zlvApi.injectEndpoints({
       DatafoncierHousingQuery
     >({
       query: (params) => `datafoncier/housing${getURLQuery(params)}`,
-      providesTags: () => [{ type: 'Datafoncier housing', id: 'LIST' }],
+      providesTags: () => [{ type: 'Datafoncier housing', id: 'LIST' }]
     }),
     findOneHousing: builder.query<DatafoncierHousing, string>({
       query: (id: string) => `datafoncier/housing/${id}`,
       providesTags: (housing, error, id) => [
-        { type: 'Datafoncier housing', id },
-      ],
-    }),
-  }),
+        { type: 'Datafoncier housing', id }
+      ]
+    })
+  })
 });
 
 interface DatafoncierHousingQuery

frontend/src/services/group.service.ts

@@ -1,4 +1,4 @@
-import { GroupDTO, PaginationOptions } from '../../../shared';
+import { GroupDTO, PaginationOptions } from '@zerologementvacant/models';
 import { fromGroupDTO, Group } from '../models/Group';
 import { GroupFilters } from '../models/GroupFilters';
 import fp from 'lodash/fp';
@@ -19,17 +19,17 @@ export const groupApi = zlvApi.injectEndpoints({
           ? [
               ...groups.map((group) => ({
                 type: 'Group' as const,
-                id: group.id,
+                id: group.id
               })),
-              { type: 'Group', id: 'LIST' },
+              { type: 'Group', id: 'LIST' }
             ]
           : [{ type: 'Group', id: 'LIST' }],
-      transformResponse: (groups: GroupDTO[]) => groups.map(fromGroupDTO),
+      transformResponse: (groups: GroupDTO[]) => groups.map(fromGroupDTO)
     }),
     getGroup: builder.query<Group, string>({
       query: (id: string) => `groups/${id}`,
       providesTags: (result, error, id) => [{ type: 'Group', id }],
-      transformResponse: (group: GroupDTO) => fromGroupDTO(group),
+      transformResponse: (group: GroupDTO) => fromGroupDTO(group)
     }),
     createGroup: builder.mutation<
       { status: number; group: Group },
@@ -38,25 +38,23 @@ export const groupApi = zlvApi.injectEndpoints({
       query: (group) => ({
         url: 'groups',
         method: 'POST',
-        body: group,
+        body: group
       }),
       invalidatesTags: [{ type: 'Group', id: 'LIST' }],
       transformResponse: (group: GroupDTO, meta) => {
         return {
           status: meta?.response?.status ?? 201,
-          group: fromGroupDTO(group),
+          group: fromGroupDTO(group)
         };
-      },
+      }
     }),
     updateGroup: builder.mutation<void, GroupPayload & Pick<Group, 'id'>>({
       query: ({ id, ...group }) => ({
         url: `groups/${id}`,
         method: 'PUT',
-        body: group,
+        body: group
       }),
-      invalidatesTags: (result, error, args) => [
-        { type: 'Group', id: args.id },
-      ],
+      invalidatesTags: (result, error, args) => [{ type: 'Group', id: args.id }]
     }),
     addGroupHousing: builder.mutation<
       void,
@@ -65,21 +63,21 @@ export const groupApi = zlvApi.injectEndpoints({
       query: (group) => ({
         url: `groups/${group.id}/housing`,
         method: 'POST',
-        body: fp.omit(['id'], group),
+        body: fp.omit(['id'], group)
       }),
       invalidatesTags: (result, error, args) => [
-        { type: 'Group', id: args.id },
+        { type: 'Group', id: args.id }
       ],
       onQueryStarted: async (args, { dispatch, queryFulfilled }) => {
         await queryFulfilled;
         dispatch(
           housingApi.util.invalidateTags([
             'Housing',
             'HousingByStatus',
-            'HousingCountByStatus',
+            'HousingCountByStatus'
           ])
         );
-      },
+      }
     }),
     removeGroupHousing: builder.mutation<
       void,
@@ -88,32 +86,32 @@ export const groupApi = zlvApi.injectEndpoints({
       query: (group) => ({
         url: `groups/${group.id}/housing`,
         method: 'DELETE',
-        body: fp.omit(['id'], group),
+        body: fp.omit(['id'], group)
       }),
       invalidatesTags: (result, error, args) => [
-        { type: 'Group', id: args.id },
+        { type: 'Group', id: args.id }
       ],
       onQueryStarted: async (args, { dispatch, queryFulfilled }) => {
         await queryFulfilled;
         dispatch(
           housingApi.util.invalidateTags([
             'Housing',
             'HousingByStatus',
-            'HousingCountByStatus',
+            'HousingCountByStatus'
           ])
         );
-      },
+      }
     }),
     removeGroup: builder.mutation<void, Group>({
       query: (group) => ({
         url: `groups/${group.id}`,
-        method: 'DELETE',
+        method: 'DELETE'
       }),
       invalidatesTags: (result, error, group) => [
-        { type: 'Group', id: group.id },
-      ],
-    }),
-  }),
+        { type: 'Group', id: group.id }
+      ]
+    })
+  })
 });
 
 export const {
@@ -123,5 +121,5 @@ export const {
   useUpdateGroupMutation,
   useAddGroupHousingMutation,
   useRemoveGroupHousingMutation,
-  useRemoveGroupMutation,
+  useRemoveGroupMutation
 } = groupApi;