Skip to content

Commit

Permalink
fix(backend): fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
pYassine committed Jan 24, 2024
1 parent 7f25928 commit 1147e5b
Show file tree
Hide file tree
Showing 37 changed files with 1,615 additions and 112 deletions.
34 changes: 21 additions & 13 deletions .talismanrc
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
fileignoreconfig:
- filename: _scripts/db/dumps/domifa_test.postgres.restore-data-only.sql
- filename: \_scripts/db/dumps/domifa_test.postgres.restore-data-only.sql
checksum: 66f876156591123c240fbc85a80be6d5d8b47e44534e9e1b500f7c1dc1236ed6
- filename: _scripts/db/dumps/domifa_test.postgres.truncate-restore-data-only.sql
- filename: \_scripts/db/dumps/domifa_test.postgres.truncate-restore-data-only.sql
checksum: a2b8def2ce8fe7a42db556fc1cd480f96a55819f11cbd473804051ef74f1e2be
- filename: packages/backend/src/_common/decorators/IsValidPasswordDecorator.ts
- filename: packages/backend/src/\_common/decorators/IsValidPasswordDecorator.ts
checksum: f0d4b3cd2e6e2d9b1e0271c34d64adacf87a5f1e7a505402a20869962543608d
- filename: packages/backend/src/_migrations/1699910877010-auto-migration.ts
- filename: packages/backend/src/\_migrations/1692191990702-import-toulouse-usagers-migration.ts
checksum: 2f01f0ce3c9311140cfb0dd3fc05dbdbe735a100154aebdc7e26ff698f2a9211
- filename: packages/backend/src/\_migrations/1692216772744-decisions-migration.ts
checksum: be1c28fd2140bc53bfd395370a4c7db8c979efb97dc0b8411d765d71edfdc7eb
- filename: packages/backend/src/\_migrations/1699910877010-auto-migration.ts
checksum: bd05dd6b68f7fe2ca36ab1180a0449878cf78f4e048d2e5979b3dbe5fba1db53
- filename: packages/backend/src/_migrations/1701870413794-auto-migration.ts
- filename: packages/backend/src/\_migrations/1701870413794-auto-migration.ts
checksum: 281adc67c437b0c3ea874865872dafb0b6a4b23be044694caa6f0d210bbba0f9
- filename: packages/backend/src/_migrations/1702483465656-auto-migration.ts
- filename: packages/backend/src/\_migrations/1702483465656-auto-migration.ts
checksum: 2dbc2450c1df10f68a54897946318976bf8163711f3143e0608ce6c0e7275447
- filename: packages/backend/src/_migrations/_init-db/1603812391580-pr-env-create-database.ts
- filename: packages/backend/src/\_migrations/\_init-db/1603812391580-pr-env-create-database.ts
checksum: b9c525d9cac633693975f7526357350057063772b3c978d6cd43841e676cebcc
- filename: packages/backend/src/_portail-admin/portail-admin-login/portail-admin-login.controller.spec.ts
- filename: packages/backend/src/\_portail-admin/portail-admin-login/portail-admin-login.controller.spec.ts
checksum: 3bd78f8919cbe14a45484825d6ce816bc7e2a0456fc53b9beeb1fedb6bdb061a
- filename: packages/backend/src/_portail-usager/portail-usager-login/portail-usagers-login.controller.spec.ts
- filename: packages/backend/src/\_portail-usager/portail-usager-login/portail-usagers-login.controller.spec.ts
checksum: 2e02fb9ee9e1324dfab89afeaf4357b6339df59376ea1191f44d394524d6efd8
- filename: packages/backend/src/_tests/_core/constants/TESTS_USERS_STRUCTURE.mock.ts
- filename: packages/backend/src/\_tests/\_core/constants/TESTS_USERS_STRUCTURE.mock.ts
checksum: 7fd396491726fce9ed96ac175c3acdb9ae93ecac0d66e7c6fc5554c5deeceb6f
- filename: packages/backend/src/_tests/_core/constants/TEST_USER_USAGER.mock.ts
- filename: packages/backend/src/\_tests/\_core/constants/TEST_USER_USAGER.mock.ts
checksum: d48d45f595373ce56749cfe5b17dc6b09093d5ed9090617052652922b78b333d
- filename: packages/backend/src/_migrations/1692191990700-generate-temp-tables-migration.ts
checksum: e33f183d43233f56556d55460655e8b337ef7f098caca3099424ab2d853a928a
- filename: packages/backend/src/_migrations/1692191990702-import-toulouse-usagers-migration.ts
checksum: e53727c97e2fe4d2e481df0f554fd835e51a9f8671a3bccd2310a595b826cf64
- filename: packages/backend/src/auth/structures-auth.controller.spec.ts
checksum: 5cc345a4fee5809b8cbb892e660cfc90a12c674b90919767037e9235a9f222ee
- filename: packages/backend/src/database/services/user-usager/user-usager-security/userUsagerSecurityPasswordUpdater.service.ts
Expand Down Expand Up @@ -53,7 +61,7 @@ fileignoreconfig:
checksum: 7749036582dd467fd5c71aba534aec66fecabc3185b7fd7ee75705204877b654
- filename: packages/frontend/src/assets/files/news.json
checksum: 87de77471263e0fd5b2561e4be2c9ea7fc1e34f29c24f168de3e378a6d738004
- filename: packages/portail-usagers/src/app/modules/general/components/_static/cgu/cgu.component.html
- filename: packages/portail-usagers/src/app/modules/general/components/\_static/cgu/cgu.component.html
checksum: 584da8c9b8ebc95d1d996d0201e0e57cf31e05c6704104e7adacba67a7eb4dd7
- filename: packages/portail-usagers/src/app/modules/usager-auth/services/usager-auth.service.ts
checksum: 628884c40a4907e9161c55bbd77110f15fad0504c7060a7be6be6612fe44daec
Expand All @@ -62,5 +70,5 @@ fileignoreconfig:
- filename: packages/portail-usagers/src/app/modules/usager-auth/usager-login/usager-login.component.ts
checksum: b04680c071a8098191859f5a67124df3d168478ee2f997a361595b7244d1f5f7
- filename: yarn.lock
checksum: 7d003c01f8bee02f4f1910d80b12164c613b81c13db0b2e81e330d4413efaa6c
checksum: b1eb3ca3b86acf56658fc56a7d93070cf7f80881078972160f302937d18db5c9
version: "1.0"
2 changes: 1 addition & 1 deletion docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ volumes:

services:
postgres:
image: postgis/postgis:14-3.4
image: postgres:14.9-alpine3.18
container_name: domifa-postgres
volumes:
- postgres-data:/var/lib/postgresql/data
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/nodemon.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"watch": ["src", ".env"],
"ext": "ts",
"ignore": ["src/**/*.spec.ts"],
"exec": "ts-node -r tsconfig-paths/register src/run-app.ts | pino-pretty --singleLine"
"exec": "ts-node -r tsconfig-paths/register src/run-app.ts | pino-pretty --singleLine"
}
4 changes: 3 additions & 1 deletion packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"@sentry/opentelemetry-node": "^7.91.0",
"@socialgouv/streaming-file-encryption": "^1.1.0",
"@types/source-map-support": "^0.5.4",
"@wmfs/xml2csv": "^1.32.0",
"axios": "^1.6.2",
"bcryptjs": "^2.4.3",
"cache-manager": "^5.3.2",
Expand All @@ -74,6 +75,7 @@
"email-templates": "^10.0.0",
"exceljs": "^4.2.1",
"express": "^4.18.2",
"fast-xml-parser": "^4.2.7",
"fs-extra": "^11.1.1",
"google-libphonenumber": "^3.2.33",
"ics": "^2.41.0",
Expand Down Expand Up @@ -104,7 +106,7 @@
"typeorm": "^0.3.17",
"uuid": "^9.0.1",
"xlsx": "^0.18.5",
"yup": "^0.32.11",
"yup": "^0.32.9",
"yup-phone": "^1.3.2"
},
"devDependencies": {
Expand Down
5 changes: 4 additions & 1 deletion packages/backend/src/_common/model/usager/Usager.type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ export type Usager = AppEntity & {
etapeDemande: number;
rdv: UsagerRdv | null;
entretien: UsagerEntretien;
pinnedNote: Partial<UsagerNote> | null;
pinnedNote: Pick<
UsagerNote,
"message" | "usagerRef" | "createdAt" | "createdBy"
> | null;

// INFOS DOMICILIATION
typeDom: UsagerTypeDom;
Expand Down
8 changes: 8 additions & 0 deletions packages/backend/src/_common/tmp-toulouse/MOTIF.const.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export const MOTIF = {
1: "Recommandé",
4: "OFPRA",
5: "CNDA",
7: "Colis",
8: "OFII",
9: "DG des Etrangers en France",
};
215 changes: 215 additions & 0 deletions packages/backend/src/_common/tmp-toulouse/PAYS.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
export const PAYS = {
2: "Algérie",
3: "Togo",
5: "Arménie",
6: "Espagne",
7: "Pologne",
8: "Bulgarie",
9: "Mozambique",
10: "Cote d&apos;Ivoire",
11: "Irak",
12: "Maroc",
13: "Syrie",
14: "Roumanie",
15: "Lituanie",
17: "Tunisie",
18: "Tchad",
19: "Russie",
21: "Sierra Leone",
22: "Ukraine",
23: "Rwanda",
24: "Angola",
25: "Italie",
28: "Tchétchénie",
29: "Madagascar",
30: "Moldavie",
35: "Azerbaidjan",
38: "Slovaquie",
39: "Portugal",
41: "Niger",
42: "Turquie",
43: "Somalie",
44: "Cameroun",
45: "Iran",
46: "Libye",
47: "Allemagne",
48: "Albanie",
49: "Soudan",
51: "Nigeria",
52: "Ethiopie",
55: "Finlande",
62: "Suisse",
63: "Laos",
65: "Sénégal",
68: "Biélorussie",
73: "Viêtnam",
74: "France",
76: "Belgique",
78: "Burkina Faso",
81: "Colombie",
83: "Bénin",
85: "Mauritanie",
88: "Estonie",
90: "Bosnie-Herzgovine",
92: "Mongolie",
94: "Djibouti",
96: "Israël",
97: "Hongrie",
98: "Thaïlande",
101: "Burundi",
104: "Jamaïque",
105: "Angleterre",
110: "Pakistan",
111: "Ghana",
113: "Brésil",
114: "Afghanistan",
116: "Gambie",
117: "Lettonie",
121: "Egypte",
122: "Slovénie",
137: "Argentine",
138: "Japon",
140: "Norvège",
142: "Comores",
147: "Mali",
158: "Liban",
160: "Cuba",
161: "Cap-Vert",
168: "Luxembourg",
169: "Inde",
170: "Canada",
171: "Chili",
173: "Mexique",
174: "Cambodge",
177: "Malaisie",
179: "Haïti",
180: "Palestine",
182: "Irlande",
186: "Chine",
188: "Bangladesh",
190: "Guatemala",
191: "Suriname",
192: "Vénézuéla",
193: "Croatie",
194: "République Tchèque",
195: "Corée du Nord",
197: "Philippines",
198: "Monténégro",
201: "Pays-Bas",
202: "Autriche",
206: "Andorre ",
207: "Equateur",
208: "Yémen",
209: "République dominicaine",
210: "Bolivie",
211: "Erythrée",
219: "Sri Lanka",
220: "Ouzbékistan",
222: "Zimbabwe",
224: "Grèce",
225: "Pérou",
226: "Etats-Unis",
227: "Géorgie",
228: "Guinée",
229: "Guinée Equatoriale",
232: "",
233: "Bélorussie",
235: "Koweït",
236: "Gabon",
238: "Costa Rica",
240: "Sahara occidental",
241: "Serbie",
242: "Birmanie",
243: "Ouganda",
244: "Indonesie",
245: "Nouvelle-Zélande",
248: "Emirats arabes unis",
253: "Tanzanie ",
254: "Danemark",
257: "Nicaragua",
260: "Suède",
261: "Sao Tomé-et-Principe",
262: "Royaume-Uni",
265: "Paraguay",
266: "Népal",
267: "Arabie Soudite",
268: "Honduras",
269: "Kenya",
273: "Guinée-Bissau",
274: "Guyane Britannique",
275: "Kosovo",
276: "Australie",
277: "Kazakhstan",
278: "Jordanie",
279: "Sainte-Lucie",
280: "Corée du sud",
281: "Zambie",
282: "Île Maurice",
283: "Abkhazie",
284: "Afrique du Sud",
285: "Antigua-et-Barbuda",
286: "Bahamas",
287: "Bahreïn",
288: "Barbade",
289: "Belize",
290: "Bhoutan",
291: "Botswana",
292: "Brunei",
293: "Chypre du Nord",
294: "Chypre du Sud",
295: "Dominique",
296: "Fidji",
297: "Grenade",
298: "Îles Cook",
299: "Îles Marshall",
300: "Irlande du Nord",
301: "Islande",
302: "Kirghizistan",
303: "Kiribati",
304: "Lesotho",
305: "Liechtenstein",
306: "Malawi",
307: "Maldives",
308: "Malte",
309: "Monaco",
310: "Namibie",
311: "Nauru",
312: "Niue",
313: "Oman",
314: "Ossétie du Sud",
315: "Palaos",
316: "Panama",
317: "Papouasie-Nouvelle-Guinée",
318: "République centrafricaine",
319: "République de Macédoine",
320: "Congo - Brazzaville",
321: "Congo - Kinshasa",
322: "Saint-Christophe-et-Niévès",
323: "Saint-Marin",
324: "Saint-Vincent-et-les-Grenadines",
325: "Salomon",
326: "Salvador",
327: "Samoa",
328: "Seychelles",
329: "Singapour",
330: "Soudan du Sud",
331: "Swaziland",
342: "Tadjikistan",
343: "Taïwan",
344: "Timor oriental",
345: "Tonga",
346: "Trinité-et-Tobago",
347: "Turkménistan",
348: "Tuvalu",
349: "Uruguay",
350: "Vanuatu",
351: "Vatican",
352: "Micronésie",
353: "Myanmar",
354: "Qatar",
355: "Somaliland",
356: "Tchécoslovaquie",
357: "Yougoslavie",
358: "Zaïre",
359: "Liberia",
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const TOULOUSE_STRUCTURE_ID = 1;
export const TOULOUSE_USER_ID = 1;
34 changes: 34 additions & 0 deletions packages/backend/src/_common/tmp-toulouse/TUsager.interface.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
export interface TUsager {
IDDomicilie: number;
Nom: string;
Nom_epouse: string | null;
prénom: string;
genre: number;
date_naissance: any; // ou date_naissance: number; selon ce que vous préférez
Nationalité: number;
Pays_naissance: number;
Remarques: string;
Piece_identité: number;
date_validité_PI: string; // ou date_validité_PI: number; selon ce que vous préférez
Service_presc: number;
valide: number; // peut-être considéré comme un boolean si cela représente une valeur booléenne (1 ou 0)
du: string; // ou du: number; selon ce que vous préférez
au: string; // ou au: number; selon ce que vous préférez
Num_domici: number;
enfant: number; // peut-être considéré comme un boolean si cela représente une valeur booléenne (1 ou 0)
enfant_de: string | number; // peut-être considéré comme un boolean si cela représente une valeur booléenne (1 ou 0)
relation: string | null;
motif: number;
dernier_retrait: string; // ou dernier_retrait: number; selon ce que vous préférez
date_creation: string | null;
lieu_naiss: string;
codeb: number;
ame: number; // peut-être considéré comme un boolean si cela représente une valeur booléenne (1 ou 0)
courrier_sens: number; // peut-être considéré comme un boolean si cela représente une valeur booléenne (1 ou 0)
comportement: number;
procuration: number; // peut-être considéré comme un boolean si cela représente une valeur booléenne (1 ou 0)
nom_procuration: string | null;
telephone: string | null;
email: string | null;
nomenveloppe: number; // peut-être considéré comme un boolean si cela représente une valeur booléenne (1 ou 0)
}
Loading

0 comments on commit 1147e5b

Please sign in to comment.