feat(contribs): publish contributions in the new format #1025

carolineBda · 2023-09-25T10:00:44Z

Fix https://github.com/orgs/SocialGouv/projects/95/views/1?pane=issue&itemId=36609333

targets/ingester/src/lib/fetchContributions/AnswerExtractor.ts

shared/elasticsearch-document-adapter/package.json

shared/types/index.ts

targets/ingester/src/lib/fetchContributions/AnswerExtractor.ts

# Conflicts: # targets/alert-cli/package.json # targets/ingester/src/lib/fetchContributions/__tests__/expected.json # yarn.lock

targets/ingester/src/lib/fetchContributions/AnswerExtractor.ts

  }

+  private toText = (answer: AnswerRaw): string =>
+    (answer.content || "").replace(HTML_TAGS, "").replace(/&nbsp;/gm, " ");


socket-security · 2023-09-27T08:58:22Z

New, updated, and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Packages	Version	New capabilities	Transitives	Size	Publisher
@hookform/resolvers	3.3.2	environment	`+0`	551 kB	bluebill1049
@socialgouv/contributions-data-types	3.27.0...3.89.0	None	`+0/-0`	28.5 kB	socialgroovybot
@tiptap/extension-table-row	2.1.7...2.1.11	None	`+2/-6`	3.92 MB	_bdbch
@tiptap/extension-table-cell	2.1.7...2.1.11	None	`+2/-6`	3.92 MB	_bdbch
@tiptap/extension-table-header	2.1.7...2.1.11	None	`+2/-6`	3.92 MB	_bdbch
@tiptap/starter-kit	2.0.3...2.1.11	None	`+38/-42`	4.84 MB	_bdbch
@tiptap/extension-table	2.1.7...2.1.11	None	`+2/-6`	4.03 MB	_bdbch
winston	3.3.3...3.9.0	None	`+0/-0`	272 kB	w-b-t

🚮 Removed packages: [email protected], [email protected], [email protected], [email protected]

shared/types/index.ts

targets/ingester/package.json

maxgfr · 2023-10-03T09:37:04Z

targets/ingester/src/lib/fetchContributions/AnswerExtractor.ts

top le refacto ! le code est beaucoup plus simple

m-maillot

Top !

shared/elasticsearch-document-adapter/package.json

m-maillot · 2023-10-03T09:21:58Z

shared/elasticsearch-document-adapter/src/cdtnDocuments.ts

@@ -1,6 +1,7 @@
 import type {
  AgreementDoc,
-  ContributionCompleteDoc,
+  ContributionGenericDoc,
+  ContributionWithCCDoc,


Suggested change

ContributionWithCCDoc,

ContributionWithAgreementDoc,

Pour une meilleur lecture et homogénéisation des termes

Après si on a générique, on peut utiliser le terme Personnalisé que le métier utilise pas mal -> ContributionCustomizedDoc ou j'aurais mis plutôt CustomizedContributionDoc et GenericContributionDoc.

Ah oui les 2 sont bien

m-maillot · 2023-10-03T09:25:39Z

shared/types/index.ts

  description: string;
-  answers: CCMultipleAnswers;
+  answer: Answer;
+  agreementsWithAnswer: string[];


Peut-être customizedAgreements pour être raccord ?

pour le coup c'est bizarre non ? Pour le métier "personnalisé" c'est quand on a une CC.
La je liste juste les CC qui ont une réponse pour cette contrib

ou alors supportedAgreements pour être raccord avec nos outils ?

m-maillot · 2023-10-03T09:28:15Z

shared/types/index.ts

+  title: string;
+  url?: string;
+};
+
 export type BaseRef = {


Je trouve BaseRef pas adapté. Ce sont nos contenus et ce ne sont pas des références mais des contenus liés. On pourrait le renommer CdtnRelatedContent ?

shared/types/index.ts

m-maillot · 2023-10-03T09:32:01Z

targets/ingester/src/index.d.ts

+  text: string;
+  content?: string | FicheServicePublicDoc;
+};
+type AnswerWithCC = Answer & { idcc: string; shortName: string };


Idem ici, on peut nommer CustomizedAnswer

m-maillot · 2023-10-03T09:33:05Z

targets/ingester/src/lib/fetchContributions/AnswerExtractor.ts

    if (!genericAnswer) {
-      return null;
+      throw new Error("No generic answer found");


ça pourrait être bien d'ajouter la question liée pour le debug.

targets/ingester/src/lib/fetchContributions/AnswerExtractor.ts

m-maillot · 2023-10-03T09:43:47Z

targets/ingester/src/transform/contributions.ts

+          is_searchable: false,
+          slug: slugify(`${parseInt(idcc, 10)}-${title}`),
+          source: SOURCES.CONTRIBUTIONS,
+          text: `${idcc} ${title}`, // actuellement c'est comme ça mais si la CC a son propre contenu est-ce que ça ne devrait pas être dans text aussi ?


A voir après l'intervention de rémi si ce champ sera encore nécessaire.

ok je vire le comment faudra qu'on retravail ça

targets/ingester/src/lib/fetchContributions/types.ts

# Conflicts: # shared/types/package.json # yarn.lock

…tatuts dans les contribs (#1070)

m-maillot · 2023-10-12T13:45:23Z

shared/types/index.ts

  description: string;
-  answers: CCMultipleAnswers;
+  answer: Answer;
+  agreementsWithAnswer: string[];


ou alors supportedAgreements pour être raccord avec nos outils ?

* fix: v1 * fix: delete com * fix: restore * show error * fix: modif --------- Co-authored-by: carolineBda <[email protected]>

* fix: merge * fix: merge * fix: build * fix: build * fix: build * fix: url * fix: types * fix: expected by snapshot * fix: test * fix: test * fix: test --------- Co-authored-by: carolineBda <[email protected]>

sonarcloud · 2023-10-18T15:36:18Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
3 Code Smells

No Coverage information
0.0% Duplication

feat(contribs): publish contributions in the new format

6190d8c

github-advanced-security bot found potential problems Sep 25, 2023

View reviewed changes

targets/ingester/src/lib/fetchContributions/AnswerExtractor.ts Fixed Show fixed Hide fixed

carolineBda added 2 commits September 25, 2023 13:48

Merge branch 'master' into carolineBda/publish-contrib

c74822d

move more types

c1167c3

carolineBda had a problem deploying to review-auto September 25, 2023 13:45 — with GitHub Actions Failure

carolineBda commented Sep 25, 2023

View reviewed changes

shared/elasticsearch-document-adapter/package.json Outdated Show resolved Hide resolved

carolineBda commented Sep 25, 2023

View reviewed changes

shared/types/index.ts Outdated Show resolved Hide resolved

put back dependency

e52d278

carolineBda had a problem deploying to review-auto September 25, 2023 14:27 — with GitHub Actions Failure

carolineBda commented Sep 25, 2023

View reviewed changes

targets/ingester/src/lib/fetchContributions/AnswerExtractor.ts Outdated Show resolved Hide resolved

fix types

5e4308b

carolineBda had a problem deploying to review-auto September 25, 2023 14:48 — with GitHub Actions Failure

carolineBda marked this pull request as draft September 27, 2023 07:36

Merge branch 'master' into carolineBda/publish-contrib

9133bbb

# Conflicts: # targets/alert-cli/package.json # targets/ingester/src/lib/fetchContributions/__tests__/expected.json # yarn.lock

carolineBda had a problem deploying to review-auto September 27, 2023 08:41 — with GitHub Actions Failure

github-advanced-security bot found potential problems Sep 27, 2023

View reviewed changes

fix all types

f786876

carolineBda had a problem deploying to review-auto September 27, 2023 13:44 — with GitHub Actions Failure

carolineBda added 2 commits September 27, 2023 15:45

Merge branch 'master' into carolineBda/publish-contrib

c60da6b

move agreements ingest

fe84e90

carolineBda had a problem deploying to review-auto September 27, 2023 15:02 — with GitHub Actions Failure

carolineBda commented Sep 28, 2023

View reviewed changes

shared/types/index.ts Show resolved Hide resolved

carolineBda commented Sep 28, 2023

View reviewed changes

targets/ingester/package.json Show resolved Hide resolved

remove un-used dependencies

ad7ecc5

carolineBda had a problem deploying to review-auto September 28, 2023 07:30 — with GitHub Actions Failure

Merge branch 'master' into carolineBda/publish-contrib

fd6dfc5

carolineBda had a problem deploying to review-auto September 28, 2023 10:40 — with GitHub Actions Failure

format data after review with Martial

56f95c3

carolineBda had a problem deploying to review-auto September 28, 2023 11:01 — with GitHub Actions Failure

carolineBda requested review from maxgfr, m-maillot and Viczei and removed request for maxgfr September 28, 2023 21:07

carolineBda marked this pull request as ready for review October 3, 2023 09:01

maxgfr approved these changes Oct 3, 2023

View reviewed changes

m-maillot approved these changes Oct 3, 2023

View reviewed changes

Viczei reviewed Oct 6, 2023

View reviewed changes

targets/ingester/src/lib/fetchContributions/types.ts Outdated Show resolved Hide resolved

Viczei approved these changes Oct 6, 2023

View reviewed changes

clean-up après reviews des devs

9959dde

carolineBda had a problem deploying to review-auto October 6, 2023 15:24 — with GitHub Actions Failure

carolineBda requested a review from m-maillot October 6, 2023 15:24

Merge branch 'deploy-new-contribs' into carolineBda/publish-contrib

b191fb1

# Conflicts: # shared/types/package.json # yarn.lock

carolineBda had a problem deploying to review-auto October 12, 2023 08:25 — with GitHub Actions Failure

fix(comments ui): meilleur affiche des commentaires & changement de s…

59e35bb

…tatuts dans les contribs (#1070)

m-maillot approved these changes Oct 12, 2023

View reviewed changes

Merge branch 'master' into carolineBda/publish-contrib

845a4b2

maxgfr had a problem deploying to review-auto October 13, 2023 09:34 — with GitHub Actions Failure

carolineBda and others added 5 commits October 16, 2023 16:12

feat(contrib): désactivation du formulaire quand on soumet (#1083)

7bbdb95

feat(admin): ajout de la suppression d'un commentaire (#1081)

9503f87

* fix: v1 * fix: delete com * fix: restore * show error * fix: modif --------- Co-authored-by: carolineBda <[email protected]>

fix(alert-cli): mise à jour des identifiants PISTE (#1084)

733b372

fix(frontend): ajout du titre dans le header (#1085)

8cdb494

Merge branch 'master' into carolineBda/publish-contrib

d4b5e2d

maxgfr had a problem deploying to review-auto October 18, 2023 14:46 — with GitHub Actions Failure

fix(alert-cli): add references from contributions (#1076)

13fdafd

* fix: merge * fix: merge * fix: build * fix: build * fix: build * fix: url * fix: types * fix: expected by snapshot * fix: test * fix: test * fix: test --------- Co-authored-by: carolineBda <[email protected]>

maxgfr had a problem deploying to review-auto October 18, 2023 15:35 — with GitHub Actions Failure

maxgfr merged commit bfa0ac4 into deploy-new-contribs Oct 24, 2023
22 of 25 checks passed

maxgfr deleted the carolineBda/publish-contrib branch October 24, 2023 09:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(contribs): publish contributions in the new format #1025

feat(contribs): publish contributions in the new format #1025

carolineBda commented Sep 25, 2023

socket-security bot commented Sep 27, 2023 •

edited

Loading

maxgfr Oct 3, 2023

m-maillot left a comment

m-maillot Oct 3, 2023

m-maillot Oct 3, 2023

carolineBda Oct 6, 2023

m-maillot Oct 3, 2023

carolineBda Oct 6, 2023

m-maillot Oct 12, 2023

m-maillot Oct 3, 2023

m-maillot Oct 3, 2023

m-maillot Oct 3, 2023

m-maillot Oct 3, 2023

carolineBda Oct 6, 2023

m-maillot Oct 12, 2023

sonarcloud bot commented Oct 18, 2023

feat(contribs): publish contributions in the new format #1025

feat(contribs): publish contributions in the new format #1025

Conversation

carolineBda commented Sep 25, 2023

socket-security bot commented Sep 27, 2023 • edited Loading

Choose a reason for hiding this comment

m-maillot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Oct 18, 2023

socket-security bot commented Sep 27, 2023 •

edited

Loading