@tricoteuses/senat 3.1.0 → 3.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (306) hide show
  1. package/lib/src/loaders.d.ts +3 -3
  2. package/lib/src/loaders.js +1 -1
  3. package/lib/src/model/agenda.d.ts +1 -1
  4. package/lib/src/model/commission.d.ts +2 -2
  5. package/lib/src/model/seance.d.ts +1 -1
  6. package/lib/src/types/ameli.d.ts +4 -1761
  7. package/lib/src/types/ameli.js +1 -1074
  8. package/lib/src/types/debats.d.ts +2 -380
  9. package/lib/src/types/debats.js +1 -266
  10. package/lib/src/types/dosleg.d.ts +69 -2953
  11. package/lib/src/types/dosleg.js +1 -2005
  12. package/lib/src/types/questions.d.ts +2 -699
  13. package/lib/src/types/questions.js +1 -493
  14. package/lib/src/types/sens.d.ts +7 -7842
  15. package/lib/src/types/sens.js +1 -4691
  16. package/lib/src/utils/nvs-parsing.d.ts +1 -1
  17. package/lib/src/utils/nvs-parsing.js +9 -1
  18. package/lib/src/videos/pipeline.d.ts +3 -3
  19. package/lib/src/videos/pipeline.js +2 -2
  20. package/package.json +1 -1
  21. package/lib/add-js-extensions-v2.d.ts +0 -1
  22. package/lib/add-js-extensions-v2.js +0 -23
  23. package/lib/add-js-extensions.d.ts +0 -1
  24. package/lib/add-js-extensions.js +0 -17
  25. package/lib/aggregates.d.ts +0 -52
  26. package/lib/aggregates.js +0 -930
  27. package/lib/aggregates.mjs +0 -713
  28. package/lib/aggregates.ts +0 -833
  29. package/lib/config.d.ts +0 -10
  30. package/lib/config.js +0 -16
  31. package/lib/config.mjs +0 -16
  32. package/lib/config.ts +0 -26
  33. package/lib/databases.d.ts +0 -2
  34. package/lib/databases.js +0 -26
  35. package/lib/databases.mjs +0 -57
  36. package/lib/databases.ts +0 -71
  37. package/lib/datasets.d.ts +0 -34
  38. package/lib/datasets.js +0 -233
  39. package/lib/datasets.mjs +0 -78
  40. package/lib/datasets.ts +0 -118
  41. package/lib/fields.d.ts +0 -10
  42. package/lib/fields.js +0 -68
  43. package/lib/fields.mjs +0 -22
  44. package/lib/fields.ts +0 -29
  45. package/lib/git.d.ts +0 -26
  46. package/lib/git.js +0 -167
  47. package/lib/index.d.ts +0 -13
  48. package/lib/index.js +0 -1
  49. package/lib/index.mjs +0 -7
  50. package/lib/index.ts +0 -64
  51. package/lib/inserters.d.ts +0 -98
  52. package/lib/inserters.js +0 -500
  53. package/lib/inserters.mjs +0 -360
  54. package/lib/inserters.ts +0 -521
  55. package/lib/legislatures.json +0 -38
  56. package/lib/loaders.d.ts +0 -58
  57. package/lib/loaders.js +0 -286
  58. package/lib/loaders.mjs +0 -158
  59. package/lib/loaders.ts +0 -271
  60. package/lib/model/agenda.d.ts +0 -6
  61. package/lib/model/agenda.js +0 -148
  62. package/lib/model/ameli.d.ts +0 -51
  63. package/lib/model/ameli.js +0 -149
  64. package/lib/model/ameli.mjs +0 -84
  65. package/lib/model/ameli.ts +0 -100
  66. package/lib/model/commission.d.ts +0 -18
  67. package/lib/model/commission.js +0 -269
  68. package/lib/model/debats.d.ts +0 -67
  69. package/lib/model/debats.js +0 -95
  70. package/lib/model/debats.mjs +0 -43
  71. package/lib/model/debats.ts +0 -68
  72. package/lib/model/documents.d.ts +0 -12
  73. package/lib/model/documents.js +0 -151
  74. package/lib/model/dosleg.d.ts +0 -7
  75. package/lib/model/dosleg.js +0 -326
  76. package/lib/model/dosleg.mjs +0 -196
  77. package/lib/model/dosleg.ts +0 -240
  78. package/lib/model/index.d.ts +0 -7
  79. package/lib/model/index.js +0 -7
  80. package/lib/model/index.mjs +0 -5
  81. package/lib/model/index.ts +0 -15
  82. package/lib/model/questions.d.ts +0 -45
  83. package/lib/model/questions.js +0 -89
  84. package/lib/model/questions.mjs +0 -71
  85. package/lib/model/questions.ts +0 -93
  86. package/lib/model/scrutins.d.ts +0 -13
  87. package/lib/model/scrutins.js +0 -114
  88. package/lib/model/seance.d.ts +0 -3
  89. package/lib/model/seance.js +0 -267
  90. package/lib/model/sens.d.ts +0 -146
  91. package/lib/model/sens.js +0 -454
  92. package/lib/model/sens.mjs +0 -415
  93. package/lib/model/sens.ts +0 -516
  94. package/lib/model/texte.d.ts +0 -7
  95. package/lib/model/texte.js +0 -256
  96. package/lib/model/texte.mjs +0 -208
  97. package/lib/model/texte.ts +0 -229
  98. package/lib/model/util.d.ts +0 -9
  99. package/lib/model/util.js +0 -38
  100. package/lib/model/util.mjs +0 -19
  101. package/lib/model/util.ts +0 -32
  102. package/lib/parsers/texte.d.ts +0 -7
  103. package/lib/parsers/texte.js +0 -228
  104. package/lib/raw_types/ameli.d.ts +0 -914
  105. package/lib/raw_types/ameli.js +0 -5
  106. package/lib/raw_types/ameli.mjs +0 -163
  107. package/lib/raw_types/debats.d.ts +0 -207
  108. package/lib/raw_types/debats.js +0 -5
  109. package/lib/raw_types/debats.mjs +0 -58
  110. package/lib/raw_types/dosleg.d.ts +0 -1619
  111. package/lib/raw_types/dosleg.js +0 -5
  112. package/lib/raw_types/dosleg.mjs +0 -438
  113. package/lib/raw_types/questions.d.ts +0 -419
  114. package/lib/raw_types/questions.js +0 -5
  115. package/lib/raw_types/questions.mjs +0 -11
  116. package/lib/raw_types/senat.d.ts +0 -11368
  117. package/lib/raw_types/senat.js +0 -5
  118. package/lib/raw_types/sens.d.ts +0 -8248
  119. package/lib/raw_types/sens.js +0 -5
  120. package/lib/raw_types/sens.mjs +0 -508
  121. package/lib/raw_types_kysely/ameli.d.ts +0 -915
  122. package/lib/raw_types_kysely/ameli.js +0 -7
  123. package/lib/raw_types_kysely/ameli.mjs +0 -5
  124. package/lib/raw_types_kysely/ameli.ts +0 -951
  125. package/lib/raw_types_kysely/debats.d.ts +0 -207
  126. package/lib/raw_types_kysely/debats.js +0 -7
  127. package/lib/raw_types_kysely/debats.mjs +0 -5
  128. package/lib/raw_types_kysely/debats.ts +0 -222
  129. package/lib/raw_types_kysely/dosleg.d.ts +0 -3532
  130. package/lib/raw_types_kysely/dosleg.js +0 -7
  131. package/lib/raw_types_kysely/dosleg.mjs +0 -5
  132. package/lib/raw_types_kysely/dosleg.ts +0 -3621
  133. package/lib/raw_types_kysely/questions.d.ts +0 -414
  134. package/lib/raw_types_kysely/questions.js +0 -7
  135. package/lib/raw_types_kysely/questions.mjs +0 -5
  136. package/lib/raw_types_kysely/questions.ts +0 -426
  137. package/lib/raw_types_kysely/sens.d.ts +0 -4394
  138. package/lib/raw_types_kysely/sens.js +0 -7
  139. package/lib/raw_types_kysely/sens.mjs +0 -5
  140. package/lib/raw_types_kysely/sens.ts +0 -4499
  141. package/lib/raw_types_schemats/ameli.d.ts +0 -539
  142. package/lib/raw_types_schemats/ameli.js +0 -2
  143. package/lib/raw_types_schemats/ameli.mjs +0 -2
  144. package/lib/raw_types_schemats/ameli.ts +0 -601
  145. package/lib/raw_types_schemats/debats.d.ts +0 -127
  146. package/lib/raw_types_schemats/debats.js +0 -2
  147. package/lib/raw_types_schemats/debats.mjs +0 -2
  148. package/lib/raw_types_schemats/debats.ts +0 -145
  149. package/lib/raw_types_schemats/dosleg.d.ts +0 -977
  150. package/lib/raw_types_schemats/dosleg.js +0 -2
  151. package/lib/raw_types_schemats/dosleg.mjs +0 -2
  152. package/lib/raw_types_schemats/dosleg.ts +0 -2193
  153. package/lib/raw_types_schemats/questions.d.ts +0 -235
  154. package/lib/raw_types_schemats/questions.js +0 -2
  155. package/lib/raw_types_schemats/questions.mjs +0 -2
  156. package/lib/raw_types_schemats/questions.ts +0 -249
  157. package/lib/raw_types_schemats/sens.d.ts +0 -6915
  158. package/lib/raw_types_schemats/sens.js +0 -2
  159. package/lib/raw_types_schemats/sens.mjs +0 -2
  160. package/lib/raw_types_schemats/sens.ts +0 -2907
  161. package/lib/scripts/convert_data.d.ts +0 -1
  162. package/lib/scripts/convert_data.js +0 -354
  163. package/lib/scripts/convert_data.mjs +0 -181
  164. package/lib/scripts/convert_data.ts +0 -243
  165. package/lib/scripts/data-download.d.ts +0 -1
  166. package/lib/scripts/data-download.js +0 -12
  167. package/lib/scripts/datautil.d.ts +0 -8
  168. package/lib/scripts/datautil.js +0 -34
  169. package/lib/scripts/datautil.mjs +0 -16
  170. package/lib/scripts/datautil.ts +0 -19
  171. package/lib/scripts/images/transparent_150x192.jpg +0 -0
  172. package/lib/scripts/images/transparent_155x225.jpg +0 -0
  173. package/lib/scripts/parse_textes.d.ts +0 -1
  174. package/lib/scripts/parse_textes.js +0 -44
  175. package/lib/scripts/parse_textes.mjs +0 -46
  176. package/lib/scripts/parse_textes.ts +0 -65
  177. package/lib/scripts/retrieve_agenda.d.ts +0 -1
  178. package/lib/scripts/retrieve_agenda.js +0 -132
  179. package/lib/scripts/retrieve_cr_commission.d.ts +0 -1
  180. package/lib/scripts/retrieve_cr_commission.js +0 -364
  181. package/lib/scripts/retrieve_cr_seance.d.ts +0 -6
  182. package/lib/scripts/retrieve_cr_seance.js +0 -347
  183. package/lib/scripts/retrieve_documents.d.ts +0 -3
  184. package/lib/scripts/retrieve_documents.js +0 -219
  185. package/lib/scripts/retrieve_documents.mjs +0 -249
  186. package/lib/scripts/retrieve_documents.ts +0 -298
  187. package/lib/scripts/retrieve_open_data.d.ts +0 -1
  188. package/lib/scripts/retrieve_open_data.js +0 -315
  189. package/lib/scripts/retrieve_open_data.mjs +0 -217
  190. package/lib/scripts/retrieve_open_data.ts +0 -268
  191. package/lib/scripts/retrieve_senateurs_photos.d.ts +0 -1
  192. package/lib/scripts/retrieve_senateurs_photos.js +0 -147
  193. package/lib/scripts/retrieve_senateurs_photos.mjs +0 -147
  194. package/lib/scripts/retrieve_senateurs_photos.ts +0 -177
  195. package/lib/scripts/retrieve_videos.d.ts +0 -1
  196. package/lib/scripts/retrieve_videos.js +0 -461
  197. package/lib/scripts/shared/cli_helpers.d.ts +0 -95
  198. package/lib/scripts/shared/cli_helpers.js +0 -91
  199. package/lib/scripts/shared/cli_helpers.ts +0 -36
  200. package/lib/scripts/shared/util.d.ts +0 -4
  201. package/lib/scripts/shared/util.js +0 -35
  202. package/lib/scripts/shared/util.ts +0 -33
  203. package/lib/scripts/test_iter_load.d.ts +0 -1
  204. package/lib/scripts/test_iter_load.js +0 -12
  205. package/lib/src/ameli.d.ts +0 -66
  206. package/lib/src/ameli.js +0 -1
  207. package/lib/src/databases.d.ts +0 -3
  208. package/lib/src/databases.js +0 -26
  209. package/lib/src/db_types/ameli.d.ts +0 -1762
  210. package/lib/src/db_types/ameli.js +0 -1074
  211. package/lib/src/db_types/debats.d.ts +0 -380
  212. package/lib/src/db_types/debats.js +0 -266
  213. package/lib/src/db_types/dosleg.d.ts +0 -2954
  214. package/lib/src/db_types/dosleg.js +0 -2005
  215. package/lib/src/db_types/questions.d.ts +0 -699
  216. package/lib/src/db_types/questions.js +0 -493
  217. package/lib/src/db_types/sens.d.ts +0 -7843
  218. package/lib/src/db_types/sens.js +0 -4691
  219. package/lib/src/debats.d.ts +0 -38
  220. package/lib/src/debats.js +0 -1
  221. package/lib/src/dosleg.d.ts +0 -142
  222. package/lib/src/dosleg.js +0 -193
  223. package/lib/src/model/ameli_postgres.d.ts +0 -67
  224. package/lib/src/model/ameli_postgres.js +0 -150
  225. package/lib/src/other_types/questions.d.ts +0 -2
  226. package/lib/src/other_types/questions.js +0 -1
  227. package/lib/src/questions.d.ts +0 -53
  228. package/lib/src/questions.js +0 -1
  229. package/lib/src/raw_types/senat.d.ts +0 -11372
  230. package/lib/src/raw_types/senat.js +0 -5
  231. package/lib/src/rich_types/agenda.d.ts +0 -45
  232. package/lib/src/rich_types/agenda.js +0 -1
  233. package/lib/src/rich_types/compte_rendu.d.ts +0 -83
  234. package/lib/src/rich_types/compte_rendu.js +0 -1
  235. package/lib/src/rich_types/sessions.d.ts +0 -6
  236. package/lib/src/rich_types/sessions.js +0 -19
  237. package/lib/src/rich_types/texte.d.ts +0 -72
  238. package/lib/src/rich_types/texte.js +0 -15
  239. package/lib/src/scripts/test_iter_load.d.ts +0 -1
  240. package/lib/src/scripts/test_iter_load.js +0 -12
  241. package/lib/src/sens.d.ts +0 -104
  242. package/lib/src/sens.js +0 -1
  243. package/lib/strings.d.ts +0 -1
  244. package/lib/strings.js +0 -18
  245. package/lib/strings.mjs +0 -18
  246. package/lib/strings.ts +0 -26
  247. package/lib/tsconfig.tsbuildinfo +0 -1
  248. package/lib/types/agenda.d.ts +0 -44
  249. package/lib/types/agenda.js +0 -1
  250. package/lib/types/ameli.d.ts +0 -5
  251. package/lib/types/ameli.js +0 -1
  252. package/lib/types/ameli.mjs +0 -13
  253. package/lib/types/ameli.ts +0 -21
  254. package/lib/types/compte_rendu.d.ts +0 -83
  255. package/lib/types/compte_rendu.js +0 -1
  256. package/lib/types/debats.d.ts +0 -2
  257. package/lib/types/debats.js +0 -1
  258. package/lib/types/debats.mjs +0 -2
  259. package/lib/types/debats.ts +0 -6
  260. package/lib/types/dosleg.d.ts +0 -70
  261. package/lib/types/dosleg.js +0 -1
  262. package/lib/types/dosleg.mjs +0 -151
  263. package/lib/types/dosleg.ts +0 -284
  264. package/lib/types/questions.d.ts +0 -2
  265. package/lib/types/questions.js +0 -1
  266. package/lib/types/questions.mjs +0 -1
  267. package/lib/types/questions.ts +0 -3
  268. package/lib/types/sens.d.ts +0 -10
  269. package/lib/types/sens.js +0 -1
  270. package/lib/types/sens.mjs +0 -1
  271. package/lib/types/sens.ts +0 -12
  272. package/lib/types/sessions.d.ts +0 -5
  273. package/lib/types/sessions.js +0 -84
  274. package/lib/types/sessions.mjs +0 -43
  275. package/lib/types/sessions.ts +0 -42
  276. package/lib/types/texte.d.ts +0 -74
  277. package/lib/types/texte.js +0 -16
  278. package/lib/types/texte.mjs +0 -16
  279. package/lib/types/texte.ts +0 -76
  280. package/lib/typings/windows-1252.d.js +0 -2
  281. package/lib/typings/windows-1252.d.mjs +0 -2
  282. package/lib/typings/windows-1252.d.ts +0 -11
  283. package/lib/utils/cr_spliting.d.ts +0 -28
  284. package/lib/utils/cr_spliting.js +0 -265
  285. package/lib/utils/date.d.ts +0 -10
  286. package/lib/utils/date.js +0 -100
  287. package/lib/utils/nvs-timecode.d.ts +0 -7
  288. package/lib/utils/nvs-timecode.js +0 -79
  289. package/lib/utils/reunion_grouping.d.ts +0 -9
  290. package/lib/utils/reunion_grouping.js +0 -361
  291. package/lib/utils/reunion_odj_building.d.ts +0 -5
  292. package/lib/utils/reunion_odj_building.js +0 -154
  293. package/lib/utils/reunion_parsing.d.ts +0 -23
  294. package/lib/utils/reunion_parsing.js +0 -209
  295. package/lib/utils/scoring.d.ts +0 -14
  296. package/lib/utils/scoring.js +0 -147
  297. package/lib/utils/string_cleaning.d.ts +0 -7
  298. package/lib/utils/string_cleaning.js +0 -57
  299. package/lib/validators/config.d.ts +0 -9
  300. package/lib/validators/config.js +0 -10
  301. package/lib/validators/config.mjs +0 -54
  302. package/lib/validators/config.ts +0 -79
  303. package/lib/validators/senat.d.ts +0 -0
  304. package/lib/validators/senat.js +0 -28
  305. package/lib/validators/senat.mjs +0 -24
  306. package/lib/validators/senat.ts +0 -26
@@ -1,68 +0,0 @@
1
- import {
2
- Debat, debatsFieldsToTrim,
3
- LecAssDeb, lecassdebFieldsToTrim,
4
- } from "../types/debats"
5
- import { dbByName } from "../databases"
6
- import { trimFieldsRight } from "../fields"
7
-
8
- export const getDebats = async (ids: string[]): Promise<Debat[]> => {
9
- if (ids.length === 0) {
10
- return []
11
- }
12
- return (
13
- await dbByName.debats.any(
14
- `
15
- SELECT *
16
- FROM debats
17
- WHERE datsea IN ($<ids:list>)
18
- `,
19
- {
20
- ids,
21
- },
22
- )
23
- ).map((debat: Debat) => trimFieldsRight(debatsFieldsToTrim, debat))
24
- }
25
-
26
- export const getDebatsFromLecassidts = async (
27
- ids: string[],
28
- ): Promise<Debat[]> => {
29
- if (ids.length === 0) {
30
- return []
31
- }
32
- return (
33
- await dbByName.debats.any(
34
- `
35
- SELECT *
36
- FROM debats
37
- WHERE datsea IN (
38
- SELECT datsea
39
- FROM lecassdeb
40
- WHERE lecassidt IN ($<ids:list>)
41
- )
42
- `,
43
- {
44
- ids,
45
- },
46
- )
47
- ).map((debat: Debat) => trimFieldsRight(debatsFieldsToTrim, debat))
48
- }
49
-
50
- export const getLecAssDebsFromDatseas = async (
51
- ids: string[],
52
- ): Promise<LecAssDeb[]> => {
53
- if (ids.length === 0) {
54
- return []
55
- }
56
- return (
57
- await dbByName.debats.any(
58
- `
59
- SELECT *
60
- FROM lecassdeb
61
- WHERE datsea IN ($<ids:list>)
62
- `,
63
- {
64
- ids,
65
- },
66
- )
67
- ).map((lecassdeb: LecAssDeb) => trimFieldsRight(lecassdebFieldsToTrim, lecassdeb))
68
- }
@@ -1,12 +0,0 @@
1
- import { Expression, InferResult, SelectQueryBuilder } from "kysely";
2
- export declare function rapports(lectureAssembleeId: Expression<string>): import("kysely").RawBuilder<{
3
- [x: string]: any;
4
- }[]>;
5
- declare const queryTextes: SelectQueryBuilder<any, any, any>;
6
- export declare function textes(lectureAssembleeId: Expression<string>): import("kysely").RawBuilder<{
7
- [x: string]: any;
8
- }[]>;
9
- export declare function findAllTextes(): AsyncIterableIterator<DocumentResult>;
10
- export declare function findAllRapports(): AsyncIterableIterator<DocumentResult>;
11
- export type DocumentResult = InferResult<typeof queryTextes>[0];
12
- export {};
@@ -1,151 +0,0 @@
1
- import { sql } from "kysely";
2
- import { dbSenat } from "../databases";
3
- import { concat, rtrim, toDateString } from "./util";
4
- import { jsonArrayFrom } from "kysely/helpers/postgres";
5
- function orderOrdreOrigineTexte(expr) {
6
- return sql `array_position(array['0','2','1'], ${expr})`;
7
- }
8
- function auteursRapport(rapportId) {
9
- return jsonArrayFrom(dbSenat
10
- .withSchema("dosleg")
11
- .selectFrom("dosleg.auteur")
12
- .leftJoin("dosleg.ecr", "dosleg.ecr.autcod", "dosleg.auteur.autcod")
13
- .leftJoin("dosleg.rolsig", "dosleg.rolsig.signataire", "dosleg.ecr.signataire")
14
- .where("dosleg.ecr.rapcod", "=", rapportId)
15
- .select([
16
- "dosleg.auteur.prenom as prenom",
17
- "dosleg.auteur.nomuse as nom_usuel",
18
- "dosleg.auteur.autmat as matricule",
19
- "dosleg.ecr.ecrnumtri as ordre",
20
- "dosleg.rolsig.rolsiglib as role",
21
- "dosleg.ecr.ecrqua as qualite",
22
- ])
23
- .orderBy("dosleg.ecr.ecrnumtri", "asc"));
24
- }
25
- function documentsAttaches(rapportId) {
26
- return jsonArrayFrom(dbSenat
27
- .withSchema("dosleg")
28
- .selectFrom("docatt")
29
- .leftJoin("typatt", "docatt.typattcod", "typatt.typattcod")
30
- .where("docatt.rapcod", "=", rapportId)
31
- .select([
32
- "docatt.docatturl as url",
33
- "typatt.typattlib as type_document"
34
- ]));
35
- }
36
- function selectRapportAttributes({ eb, ref, val }) {
37
- return [
38
- "rap.rapnum as numero",
39
- "raporg.orgcod as code_organisme",
40
- eb
41
- .case()
42
- .when("rap.rapurl", "is not", null)
43
- .then(sql `regexp_replace(trim(${ref("rap.rapurl")}), '^(.*/)?(.*?)(\\.html)?$', '\\2')`)
44
- .else(null)
45
- .end()
46
- .as("id"),
47
- eb
48
- .case()
49
- .when("rap.typurl", "=", "I")
50
- .then(concat(val("https://www.senat.fr/rap/"), rtrim(ref("rap.rapurl"))))
51
- .else(rtrim(ref("rap.rapurl")))
52
- .end()
53
- .as("url"),
54
- rtrim(ref("denrap.libdenrap")).as("type"),
55
- rtrim(rtrim(ref("rap.raptil"))).as("titre"),
56
- rtrim(rtrim(ref("rap.rapsoustit"))).as("sous_titre"),
57
- toDateString(ref("rap.date_depot")).as("date"),
58
- "rap.sesann as session",
59
- auteursRapport(ref("rap.rapcod")).as("auteurs"),
60
- documentsAttaches(ref("rap.rapcod")).as("documents_annexes"),
61
- ];
62
- }
63
- const baseQueryRapports = dbSenat
64
- .withSchema("dosleg")
65
- .selectFrom("rap")
66
- .leftJoin("raporg", "raporg.rapcod", "rap.rapcod")
67
- .leftJoin("denrap", "denrap.coddenrap", "rap.coddenrap")
68
- .leftJoin("lecassrap", "lecassrap.rapcod", "rap.rapcod");
69
- const queryRapports = baseQueryRapports
70
- .leftJoin("lecass", "lecass.lecassidt", "lecassrap.lecassidt")
71
- .leftJoin("lecture", "lecture.lecidt", "lecass.lecidt")
72
- .leftJoin("loi", "loi.loicod", "lecture.loicod")
73
- .select((args) => [
74
- "loi.signet as signet_dossier",
75
- ...selectRapportAttributes(args),
76
- ]);
77
- export function rapports(lectureAssembleeId) {
78
- return jsonArrayFrom(baseQueryRapports
79
- .select(selectRapportAttributes)
80
- .where("lecassrap.lecassidt", "=", lectureAssembleeId));
81
- }
82
- function auteursTexte(texteId) {
83
- return jsonArrayFrom(dbSenat
84
- .withSchema("dosleg")
85
- .selectFrom("auteur")
86
- .leftJoin("ecr", "ecr.autcod", "auteur.autcod")
87
- .leftJoin("rolsig", "rolsig.signataire", "ecr.signataire")
88
- .where("ecr.texcod", "=", texteId)
89
- .select([
90
- "auteur.prenom as prenom",
91
- "auteur.nomuse as nom_usuel",
92
- "auteur.autmat as matricule",
93
- "ecr.ecrnumtri as ordre",
94
- "rolsig.rolsiglib as role",
95
- "ecr.ecrqua as qualite",
96
- ])
97
- .orderBy("ecr.ecrnumtri", "asc"));
98
- }
99
- function selectTexteAttributes({ eb, ref, val }) {
100
- return [
101
- "texte.texnum as numero",
102
- "texte.orgcod as code_organisme",
103
- eb
104
- .case()
105
- .when("texte.texurl", "is not", null)
106
- .then(sql `regexp_replace(trim(${ref("texte.texurl")}), '^(.*/)?(.*?)(\\.html)?$', '\\2')`)
107
- .else(null)
108
- .end()
109
- .as("id"),
110
- eb
111
- .case()
112
- .when("texte.typurl", "=", "I")
113
- .then(concat(val("https://www.senat.fr/leg/"), rtrim(ref("texte.texurl"))))
114
- .else(rtrim(ref("texte.texurl")))
115
- .end()
116
- .as("url"),
117
- rtrim(ref("oritxt.oritxtlib")).as("origine"),
118
- "oritxt.oriordre as ordre_origine",
119
- "oritxt.oritxtado as code_adoption",
120
- "oritxt.oritxtmod as modification",
121
- rtrim(ref("typtxt.typtxtlib")).as("type"),
122
- toDateString(ref("texte.txtoritxtdat")).as("date"),
123
- "texte.sesann as session",
124
- auteursTexte(ref("texte.texcod")).as("auteurs"),
125
- ];
126
- }
127
- const baseQueryTextes = dbSenat
128
- .withSchema("dosleg")
129
- .selectFrom("texte")
130
- .leftJoin("oritxt", "oritxt.oritxtcod", "texte.oritxtcod")
131
- .leftJoin("typtxt", "typtxt.typtxtcod", "texte.typtxtcod")
132
- .orderBy(({ ref }) => orderOrdreOrigineTexte(ref("oritxt.oriordre")));
133
- const queryTextes = baseQueryTextes
134
- .leftJoin("lecass", "lecass.lecassidt", "texte.lecassidt")
135
- .leftJoin("lecture", "lecture.lecidt", "lecass.lecidt")
136
- .leftJoin("loi", "loi.loicod", "lecture.loicod")
137
- .select((args) => [
138
- "loi.signet as signet_dossier",
139
- ...selectTexteAttributes(args),
140
- ]);
141
- export function textes(lectureAssembleeId) {
142
- return jsonArrayFrom(baseQueryTextes
143
- .select(selectTexteAttributes)
144
- .where("texte.lecassidt", "=", lectureAssembleeId));
145
- }
146
- export function findAllTextes() {
147
- return queryTextes.stream();
148
- }
149
- export function findAllRapports() {
150
- return queryRapports.stream();
151
- }
@@ -1,7 +0,0 @@
1
- import { InferResult, SelectQueryBuilder } from "kysely";
2
- declare const findAllDossiersQuery: SelectQueryBuilder<any, any, any>;
3
- export declare function findAllDossiers(): AsyncIterableIterator<DossierLegislatifResult>;
4
- export declare function getCodeActeLecture(codeNatureDossier: string, typeLecture: string, assemblee: string): string | null;
5
- export type DossierLegislatifResult = InferResult<typeof findAllDossiersQuery>[0];
6
- export declare function buildActesLegislatifs(dossier: any): any[];
7
- export {};
@@ -1,326 +0,0 @@
1
- import { sql } from "kysely";
2
- import { jsonArrayFrom } from "kysely/helpers/postgres";
3
- import { dbSenat } from "../databases";
4
- import { concat, rtrim, toDateString } from "./util";
5
- import { textes, rapports } from "./documents";
6
- function datesSeances(lectureAssembleeId) {
7
- return jsonArrayFrom(dbSenat
8
- .withSchema("dosleg")
9
- .selectFrom("dosleg.date_seance")
10
- .where("dosleg.date_seance.lecidt", "=", lectureAssembleeId)
11
- .select(({ ref }) => [toDateString(ref("dosleg.date_seance.date_s")).as("date")]));
12
- }
13
- function lecturesAssemblee(lectureId) {
14
- return jsonArrayFrom(dbSenat
15
- .withSchema("dosleg")
16
- .selectFrom("lecass")
17
- .where("lecass.lecidt", "=", lectureId)
18
- .leftJoin("ass", "ass.codass", "lecass.codass")
19
- .leftJoin("org", "org.orgcod", "lecass.orgcod")
20
- .leftJoin("orippr", "orippr.oripprcod", "lecass.orippr")
21
- .select(({ ref }) => [
22
- rtrim(ref("ass.libass")).as("assemblee"),
23
- "org.orgnom as libelle_organisme",
24
- "org.senorgcod as code_organisme",
25
- "lecass.ordreass as ordre_lecture_assemblee",
26
- "lecass.sesann as session",
27
- "orippr.oripprlib as origine_proposition",
28
- "lecass.ptlnum as numero_petite_loi",
29
- "lecass.ptlurl as url_petite_loi",
30
- "lecass.loiintmod as loi_intitule_modifie",
31
- "lecass.debatsurl as url_cr_debats",
32
- toDateString(ref("lecass.lecassamecomdat")).as("date_publication_amendements_commission"),
33
- toDateString(ref("lecass.lecassamedat")).as("date_publication_amendements_seance"),
34
- textes(ref("lecass.lecassidt")).as("textes"),
35
- rapports(ref("lecass.lecassidt")).as("rapports"),
36
- datesSeances(ref("lecass.lecassidt")).as("dates_seances"),
37
- ])
38
- .orderBy("lecass.ordreass", "asc"));
39
- }
40
- function lectures(loiId) {
41
- return jsonArrayFrom(dbSenat
42
- .withSchema("dosleg")
43
- .selectFrom("lecture")
44
- .leftJoin("typlec", "typlec.typleccod", "lecture.typleccod")
45
- .where("lecture.loicod", "=", loiId)
46
- .select(({ ref }) => [
47
- rtrim(ref("typlec.typleclib")).as("type_lecture"),
48
- rtrim(ref("lecture.leccom")).as("libelle"),
49
- "typlec.typlecord as ordre_lecture",
50
- lecturesAssemblee(ref("lecture.lecidt")).as("lectures_assemblee"),
51
- ])
52
- .orderBy("typlec.typlecord", "asc"));
53
- }
54
- function themes(loiId) {
55
- return jsonArrayFrom(dbSenat
56
- .withSchema("dosleg")
57
- .selectFrom("the")
58
- .leftJoin("loithe", "loithe.thecle", "the.thecle")
59
- .where("loithe.loicod", "=", loiId)
60
- .select(["the.thelib as libelle"]));
61
- }
62
- const findAllDossiersQuery = dbSenat
63
- .withSchema("dosleg")
64
- .selectFrom("loi")
65
- .leftJoin("typloi", "typloi.typloicod", "loi.typloicod")
66
- .leftJoin("etaloi", "etaloi.etaloicod", "loi.etaloicod")
67
- .leftJoin("deccoc", "deccoc.deccoccod", "loi.deccoccod")
68
- .select(({ eb, ref, val }) => [
69
- rtrim(ref("loi.loicod")).as("code"),
70
- "loi.numero as numero",
71
- "loi.signet as signet",
72
- sql `NULLIF(regexp_replace(loi.url_an, '^.*\\/(DL[^\\/]+)\\.asp$', '\\1'), '')`.as("code_dossier_an"),
73
- "loi.signetalt as signet_alternatif",
74
- rtrim(ref("loi.motclef")).as("mot_cle"),
75
- rtrim(ref("loi.loient")).as("titre_court"),
76
- concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loitit"))).as("titre"),
77
- concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loiint"))).as("titre_long"),
78
- concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loiintori"))).as("titre_long_original"),
79
- concat(val("https://www.senat.fr/dossier-legislatif/"), ref("loi.signet"), val(".html")).as("url"),
80
- "loi.urgence as urgence",
81
- rtrim(ref("typloi.groupe")).as("code_nature_dossier"),
82
- rtrim(ref("typloi.typloilib")).as("libelle_type_dossier"),
83
- rtrim(ref("etaloi.etaloilib")).as("etat_dossier"),
84
- "loi.url_an as url_dossier_assemblee_nationale",
85
- "loi.url_presart as url_presentation_articles",
86
- "loi.url_ordonnance as url_ordonnance",
87
- "loi.orgcod as code_organisme_resolution",
88
- "deccoc.deccoclib as libelle_decision_CoC",
89
- toDateString(ref("loi.date_decision")).as("date_decision_CoC"),
90
- "loi.num_decision as num_decision_CoC",
91
- "loi.deccocurl as url_decision_CoC",
92
- "loi.doscocurl as url_dossier_CoC",
93
- toDateString(ref("loi.saisine_date")).as("date_saisine_CoC"),
94
- "loi.saisine_par as condition_saisine_CoC",
95
- toDateString(ref("loi.proaccdat")).as("date_procedure_acceleree"),
96
- toDateString(ref("loi.proaccoppdat")).as("date_opposition_procedure_acceleree"),
97
- toDateString(ref("loi.retproaccdat")).as("date_retrait_procedure_acceleree"),
98
- toDateString(ref("loi.date_loi")).as("date_promulgation"),
99
- eb
100
- .case()
101
- .when("loi.loititjo", "is not", null)
102
- .then(concat(rtrim(ref("typloi.typloiden")), val(" "), rtrim(ref("loi.loititjo"))))
103
- .else("")
104
- .end()
105
- .as("titre_JO"),
106
- toDateString(ref("loi.loidatjo")).as("date_publication_JO"),
107
- "loi.loinumjo as numero_JO",
108
- "loi.url_jo as url_JO",
109
- toDateString(ref("loi.loidatjo2")).as("date_publication_JO_correctif_1"),
110
- "loi.loinumjo2 as numero_JO_correctif_1",
111
- "loi.url_jo2 as url_JO_correctif_1",
112
- toDateString(ref("loi.loidatjo3")).as("date_publication_JO_correctif_2"),
113
- "loi.loinumjo3 as numero_JO_correctif_2",
114
- "loi.url_jo3 as url_JO_correctif_2",
115
- lectures(ref("loi.loicod")).as("lectures"),
116
- themes(ref("loi.loicod")).as("themes"),
117
- ])
118
- .$narrowType();
119
- export function findAllDossiers() {
120
- return findAllDossiersQuery.stream();
121
- }
122
- export function getCodeActeLecture(codeNatureDossier, typeLecture, assemblee) {
123
- const codeAssemblee = assemblee === "Sénat" ? "SN" : assemblee === "Assemblée nationale" ? "AN" : null;
124
- if (typeLecture === "Commission mixte paritaire") {
125
- return "CMP";
126
- }
127
- if (!codeAssemblee) {
128
- return null;
129
- }
130
- if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Première lecture") {
131
- return `${codeAssemblee}1`;
132
- }
133
- if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Deuxième lecture") {
134
- return `${codeAssemblee}2`;
135
- }
136
- if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Troisième lecture") {
137
- return `${codeAssemblee}3`;
138
- }
139
- if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Quatrième lecture") {
140
- return `${codeAssemblee}4`;
141
- }
142
- if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Nouvelle lecture") {
143
- return `${codeAssemblee}NLEC`;
144
- }
145
- if (["ppl", "pjl", "cvn"].includes(codeNatureDossier) && typeLecture === "Lecture définitive") {
146
- return `${codeAssemblee}LDEF`;
147
- }
148
- if (["ppr"].includes(codeNatureDossier) && typeLecture === "Première lecture") {
149
- return `${codeAssemblee}LUNI`;
150
- }
151
- return null;
152
- }
153
- // Helper pour déterminer le code de phase (SN1, SN2, CMP...)
154
- function getPhasePrefix(lecture, assemblee) {
155
- if (assemblee !== "Sénat")
156
- return null;
157
- const typeLibelle = (lecture.type_lecture || "").toLowerCase();
158
- if (typeLibelle.includes("cmp") || typeLibelle.includes("mixte"))
159
- return "CMP";
160
- if (typeLibelle.includes("nouvelle lecture"))
161
- return "SNNLEC";
162
- if (typeLibelle.includes("d\u00e9finitive"))
163
- return "SNLDEF";
164
- if (typeLibelle.includes("unique"))
165
- return "SNLUNI";
166
- if (lecture.ordre_lecture) {
167
- return `SN${lecture.ordre_lecture}`;
168
- }
169
- if (typeLibelle.includes("premi\u00e8re"))
170
- return "SN1";
171
- if (typeLibelle.includes("deuxi\u00e8me") || typeLibelle.includes("seconde"))
172
- return "SN2";
173
- return "SN1";
174
- }
175
- export function buildActesLegislatifs(dossier) {
176
- const actes = [];
177
- const loiSignet = dossier.signet;
178
- const lectures = dossier.lectures || [];
179
- for (const lecture of lectures) {
180
- const lecturesAssemblee = lecture.lectures_assemblee || [];
181
- for (const lecAss of lecturesAssemblee) {
182
- // On ne traite que la partie SÉNAT
183
- if (lecAss.assemblee !== "Sénat")
184
- continue;
185
- const phasePrefix = getPhasePrefix(lecture, lecAss.assemblee);
186
- if (!phasePrefix)
187
- continue;
188
- // Préparation des textes (tri chronologique)
189
- const textes = lecAss.textes || [];
190
- const textesTries = [...textes].sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime());
191
- // =================================================================
192
- // A. DÉPÔT
193
- // =================================================================
194
- const depotTexte = textesTries.find((t) => (t.origine || "").toLowerCase().includes("déposé") ||
195
- (t.origine || "").toLowerCase().includes("transmis") ||
196
- t.ordre_origine === "0");
197
- if (depotTexte && depotTexte.date) {
198
- actes.push({
199
- code_acte: `${phasePrefix}-DEPOT`,
200
- date: depotTexte.date,
201
- libelle: `Dépôt du texte n°${depotTexte.numero}`,
202
- id: depotTexte.id,
203
- numero: depotTexte.numero,
204
- uid: `${loiSignet}-${phasePrefix}-DEPOT`,
205
- session: lecAss.session,
206
- chambre: 'SN',
207
- signet_dossier: loiSignet,
208
- texte_url: depotTexte.url,
209
- code_organisme: null
210
- });
211
- }
212
- // =================================================================
213
- // B. COMMISSION (Rapports)
214
- // =================================================================
215
- const rapports = lecAss.rapports || [];
216
- for (const rap of rapports) {
217
- if (rap.date) {
218
- actes.push({
219
- code_acte: `${phasePrefix}-COM-FOND`,
220
- date: rap.date,
221
- libelle: `Rapport n°${rap.numero} de la commission`,
222
- id: rap.id,
223
- numero: rap.numero,
224
- code_organisme: rap.code_organisme,
225
- adoption: rap.adoption,
226
- uid: `${loiSignet}-${phasePrefix}-COM`,
227
- session: lecAss.session,
228
- chambre: 'SN',
229
- signet_dossier: loiSignet,
230
- texte_url: rap.url,
231
- });
232
- }
233
- }
234
- // =================================================================
235
- // C. SÉANCE PUBLIQUE
236
- // =================================================================
237
- const datesSeances = lecAss.dates_seances || [];
238
- if (datesSeances.length > 0) {
239
- // Tri des objets dates
240
- datesSeances.sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime());
241
- const premiereSeance = datesSeances[0];
242
- if (premiereSeance && premiereSeance.date) {
243
- actes.push({
244
- // Champs pour buildParlementActeLegislatif
245
- code_acte: `${phasePrefix}-DEBATS-SEANCE`,
246
- date: premiereSeance.date,
247
- libelle: `Discussion en séance publique`,
248
- uid: `${loiSignet}-${phasePrefix}-DEBATS-SEANCE`,
249
- session: lecAss.session,
250
- chambre: 'SN',
251
- signet_dossier: loiSignet,
252
- code_organisme: null
253
- });
254
- }
255
- }
256
- // =================================================================
257
- // D. DÉCISION / VOTE
258
- // =================================================================
259
- const texteFinal = [...textesTries].reverse().find((t) => {
260
- const origine = (t.origine || "").toLowerCase();
261
- return (origine.includes("adopté") ||
262
- origine.includes("rejeté") ||
263
- origine.includes("devenu résolution") ||
264
- t.code_adoption === "O");
265
- });
266
- if (texteFinal && texteFinal.date) {
267
- const origine = (texteFinal.origine || "").toLowerCase();
268
- let libelleStatut = "Adopté";
269
- if (origine.includes("rejeté")) {
270
- libelleStatut = "Rejeté";
271
- }
272
- else if (origine.includes("devenue résolution")) {
273
- libelleStatut = "Adopté";
274
- }
275
- actes.push({
276
- code_acte: `${phasePrefix}-DEBATS-DEC`,
277
- date: texteFinal.date,
278
- libelle: `${libelleStatut === "Adopté" ? "Adoption" : "Rejet"} (Texte n°${texteFinal.numero})`,
279
- id: texteFinal.id,
280
- numero: texteFinal.numero,
281
- adoption: libelleStatut,
282
- uid: `${loiSignet}-DEC-${texteFinal.numero}`,
283
- session: lecAss.session,
284
- chambre: 'SN',
285
- signet_dossier: loiSignet,
286
- texte_url: texteFinal.url,
287
- code_organisme: null
288
- });
289
- }
290
- }
291
- }
292
- // =================================================================
293
- // E. HORS LECTURE (CC & PROMULGATION)
294
- // =================================================================
295
- if (dossier.date_decision_CoC) {
296
- actes.push({
297
- code_acte: 'CC',
298
- date: dossier.date_decision_CoC,
299
- libelle: `Décision du Conseil constitutionnel`,
300
- id: dossier.url_decision_CoC,
301
- uid: `${loiSignet}-CC`,
302
- chambre: 'AN',
303
- signet_dossier: loiSignet,
304
- texte_url: dossier.url_decision_CoC || dossier.url_dossier_CoC,
305
- });
306
- }
307
- if (dossier.date_promulgation) {
308
- actes.push({
309
- code_acte: 'PROM',
310
- date: dossier.date_promulgation,
311
- libelle: `Promulgation de la loi`,
312
- date_publication_JO: dossier.date_publication_JO,
313
- numero_JO: dossier.numero_JO,
314
- url_legifrance: dossier.url_JO,
315
- id: dossier.url_JO,
316
- uid: `${loiSignet}-PROM`,
317
- chambre: 'AN',
318
- signet_dossier: loiSignet,
319
- });
320
- }
321
- return actes.sort((a, b) => {
322
- const dateA = new Date(a.date).getTime();
323
- const dateB = new Date(b.date).getTime();
324
- return dateA - dateB;
325
- });
326
- }