En tant qu'admin je peux supprimer une entreprise #425

bbohec · 2023-07-06T15:51:18Z

No description provided.

bbohec · 2023-08-08T15:11:03Z

NO ESTAB
ESTAB CREATED & FOUND
DELETE ESTAB FROM BACK OFFICE
REMOVAL PROOF ON DB

Co-authored-by: Jérôme Burkard <JeromeBu@users.noreply.github.com>

Co-authored-by: Jérôme Burkard <JeromeBu@users.noreply.github.com> Co-authored-by: Enguerran Weiss <enguerranws@users.noreply.github.com>

Co-authored-by: Enguerran Weiss <enguerranws@users.noreply.github.com>

celineung · 2023-08-09T08:20:48Z

front/src/app/components/forms/establishment/EstablishmentForm.tsx

+      `⚠️ Etes-vous sûr de vouloir supprimer cette établissement ? ⚠️
+                (cette opération est irréversible 💀)`,


Suggested change

`⚠️ Etes-vous sûr de vouloir supprimer cette établissement ? ⚠️

(cette opération est irréversible 💀)`,

`⚠️ Etes-vous sûr de vouloir supprimer cet établissement ? ⚠️

(cette opération est irréversible 💀)`,

celineung · 2023-08-09T08:44:27Z

front/src/core-logic/adapters/EstablishmentGateway/HttpEstablishmentGateway.ts

  public addFormEstablishment$(
    formEstablishment: FormEstablishmentDto,
  ): Observable<void> {
-    return from(this.addFormEstablishment(formEstablishment));
+    return from(this.#addFormEstablishment(formEstablishment));


pourquoi avoir créé une fonction privée ici ? (pareil dans deleteEstablishment, updateFormEstablishment et requestEstablishmentModification)

Suggested change

return from(this.#addFormEstablishment(formEstablishment));

return from(this.httpClient.addFormEstablishment({

body: formEstablishment,

}));

back/src/adapters/primary/authMiddleware.ts

celineung · 2023-08-09T09:34:33Z

back/src/domain/immersionOffer/ports/FormEstablishmentRepository.ts

+export const formEstablishementUpdateFailedErrorMessage = (
+  dto: FormEstablishmentDto,
+): string =>
+  `Cannot update form establishlment DTO with siret ${dto.siret}, since it is not found.`;


Suggested change

`Cannot update form establishlment DTO with siret ${dto.siret}, since it is not found.`;

`Cannot update form establishment DTO with siret ${dto.siret}, since it is not found.`;

celineung · 2023-08-09T09:34:57Z

back/src/domain/immersionOffer/useCases/InsertEstablishmentAggregateFromFormEstablishement.ts

-      formEstablishment.siret,
-    );
-    log("Cleared existing Aggregate");
+    const establishlment =


Suggested change

const establishlment =

const establishment =

celineung · 2023-08-09T09:36:17Z

shared/src/email/emailTemplatesByName.ts

+      tags: ["suppression entreprise"],
+      createEmailVariables: ({ businessAddress, businessName, siret }) => ({
+        subject:
+          "Votre entreprise a été supprimée de la liste des entreprises accueillantes d'immersion facilitée d'Immersion Facilitée",


Suggested change

"Votre entreprise a été supprimée de la liste des entreprises accueillantes d'immersion facilitée d'Immersion Facilitée",

"Votre entreprise a été supprimée de la liste des entreprises accueillantes d'Immersion Facilitée",

celineung · 2023-08-16T09:43:05Z

shared/src/domElementIds.ts

@@ -264,6 +264,7 @@ export const domElementIds = {
    errorSiretAlreadyExistButton:
      "im-form-add-establishment__edit-establishment-button",
    submitButton: "im-form-add-establishment__submit-button",
+    deleteButton: "im-form-delete-establishment__onclick-button",


Suggested change

deleteButton: "im-form-delete-establishment__onclick-button",

deleteButton: "im-form-delete-establishment__delete-button",

celineung · 2023-08-16T09:46:37Z

front/src/core-logic/domain/establishmentPath/establishment.test.ts

+      store.dispatch(
+        establishmentSlice.actions.establishmentDeletionRequested({
+          siret: formEstablishment.siret,
+          jwt: "backoffice-jwt",


Suggested change

jwt: "backoffice-jwt",

jwt: backOfficeJwt,

celineung · 2023-08-16T09:50:26Z

front/src/core-logic/domain/establishmentPath/establishment.slice.ts

 >;

 export type EstablishmentUpdatePayload = {
  formEstablishment: FormEstablishmentDto;
  jwt: EstablishmentJwt;
 };

+export type EstablishmentDeletePayload = {


à voir: homogénéiser front + back ?

celineung · 2023-08-16T14:37:27Z

front/src/app/components/forms/establishment/AdminSiretRelatedInputs.tsx

+  const featureFlags = useFeatureFlags();
+  const { getFormFields } = useFormContents(formEstablishmentFieldsLabels);
+  const formContents = getFormFields();
+  const { register, setValue } = useFormContext();


enlever le setValue

celineung · 2023-08-16T14:40:54Z

front/src/app/components/admin/establishments/ManageEstablishment.tsx

+            />
+          </div>
+          <Button
+            title="Piloter l'entreprise"


supprimer title

mettre un id

celineung · 2023-08-16T14:47:07Z

back/src/domain/immersionOffer/useCases/RetrieveFormEstablishmentFromAggregates.unit.test.ts

+    sub: "admin",
+  };
+
+  it("throws an error if there is jwt", async () => {


Suggested change

it("throws an error if there is jwt", async () => {

it("throws an error if there is no jwt", async () => {

celineung · 2023-08-16T15:07:33Z

back/src/adapters/secondary/pg/PgDeletedEstablishmentRepository.integration.test.ts

+    await pool.end();
+  });
+
+  it("save", async () => {


que se passe-t-il si sauvegarde d'un même établissement une seconde fois ?

celineung · 2023-08-16T15:18:26Z

back/src/adapters/secondary/pg/PgFormEstablishmentRepository.integration.test.ts

+
+  describe("delete", () => {
+    it("delete establishment", async () => {
+      const formEstablishment = FormEstablishmentDtoBuilder.valid()


factoriser formEstablishment car utilisé plusieurs fois

celineung · 2023-08-16T15:35:20Z

back/src/adapters/secondary/immersionOffer/inMemoryEstablishmentGroupRepository.ts

@@ -1,4 +1,9 @@
-import { SearchImmersionResultDto } from "shared";


renommer le fichier avec une majuscule

celineung · 2023-08-16T15:41:50Z

back/src/adapters/primary/routers/createEstablishment/deleteEstablishment.e2e.test.ts

+    } = await buildTestApp());
+  });
+
+  it("200 - Establishment Aggregate & Form deleted with back office JWT", async () => {


Suggested change

it("200 - Establishment Aggregate & Form deleted with back office JWT", async () => {

it("204 - Establishment Aggregate & Form deleted with back office JWT", async () => {

bbohec assigned JeromeBu Jul 6, 2023

bbohec linked an issue Jul 6, 2023 that may be closed by this pull request

ETQ qu'admin , je peux "supprimer" une entreprise #115

Closed

bbohec self-assigned this Jul 6, 2023

bbohec force-pushed the 115-etq-quadmin-je-peux-supprimer-une-entreprise branch 2 times, most recently from b4fb026 to a91e6f7 Compare July 10, 2023 15:56

bbohec force-pushed the 115-etq-quadmin-je-peux-supprimer-une-entreprise branch 2 times, most recently from f45e4ac to 24f526b Compare July 26, 2023 09:51

bbohec force-pushed the 115-etq-quadmin-je-peux-supprimer-une-entreprise branch 4 times, most recently from 6fdc853 to b140478 Compare August 8, 2023 14:19

bbohec marked this pull request as ready for review August 8, 2023 15:11

bbohec and others added 12 commits August 8, 2023 17:11

reorganise admin tabs

ccaf2e6

prepare manage establishment user flow

397a393

Prepare admin mode on establishmentForm

4e4ce2f

Co-authored-by: Jérôme Burkard <JeromeBu@users.noreply.github.com>

fix AdminSiretRelatedInputs

db4c9ab

delete establishment with redux and target

c703faa

Co-authored-by: Jérôme Burkard <JeromeBu@users.noreply.github.com> Co-authored-by: Enguerran Weiss <enguerranws@users.noreply.github.com>

add support backoffice jwt for Get Establishment

ce50afc

Co-authored-by: Enguerran Weiss <enguerranws@users.noreply.github.com>

delete establishment agg & form domain + e2e

115464a

remove siret on groups

798d107

pg integration for establishment delete

9fdcdd8

do not use DsfrTitle

17f040b

notify establishment on establishment delete

2c23a58

better immersion contact delete

2159161

bbohec force-pushed the 115-etq-quadmin-je-peux-supprimer-une-entreprise branch from c92500d to 2159161 Compare August 8, 2023 15:12

celineung reviewed Aug 9, 2023

View reviewed changes

bbohec added 2 commits August 9, 2023 12:07

createdAt on establishmentAggregate

9f58a3b

save deleted establishment for statistics

5426dcc

celineung reviewed Aug 16, 2023

View reviewed changes

skip lbb result when lbb establishment deleted

64ad2a5

bbohec force-pushed the 115-etq-quadmin-je-peux-supprimer-une-entreprise branch from 76ab0e9 to 424f7ee Compare August 17, 2023 12:38

review

801ce6c

bbohec force-pushed the 115-etq-quadmin-je-peux-supprimer-une-entreprise branch from 424f7ee to 801ce6c Compare August 17, 2023 13:03

celineung approved these changes Aug 17, 2023

View reviewed changes

bbohec merged commit 0656a44 into main Aug 17, 2023

bbohec deleted the 115-etq-quadmin-je-peux-supprimer-une-entreprise branch August 17, 2023 13:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

En tant qu'admin je peux supprimer une entreprise #425

En tant qu'admin je peux supprimer une entreprise #425

bbohec commented Jul 6, 2023

bbohec commented Aug 8, 2023

celineung Aug 9, 2023

celineung Aug 9, 2023

celineung Aug 9, 2023

celineung Aug 9, 2023

celineung Aug 9, 2023

celineung Aug 16, 2023

celineung Aug 16, 2023

celineung Aug 16, 2023

celineung Aug 16, 2023

celineung Aug 16, 2023

celineung Aug 16, 2023

celineung Aug 16, 2023

celineung Aug 16, 2023

celineung Aug 16, 2023

celineung Aug 16, 2023

		`⚠️ Etes-vous sûr de vouloir supprimer cette établissement ? ⚠️
		(cette opération est irréversible 💀)`,

-    return from(this.#addFormEstablishment(formEstablishment));
+    return from(this.httpClient.addFormEstablishment({
+      body: formEstablishment,
+    }));

	`Cannot update form establishlment DTO with siret ${dto.siret}, since it is not found.`;
	`Cannot update form establishment DTO with siret ${dto.siret}, since it is not found.`;

	"Votre entreprise a été supprimée de la liste des entreprises accueillantes d'immersion facilitée d'Immersion Facilitée",
	"Votre entreprise a été supprimée de la liste des entreprises accueillantes d'Immersion Facilitée",

	deleteButton: "im-form-delete-establishment__onclick-button",
	deleteButton: "im-form-delete-establishment__delete-button",

	it("throws an error if there is jwt", async () => {
	it("throws an error if there is no jwt", async () => {

		@@ -1,4 +1,9 @@
		import { SearchImmersionResultDto } from "shared";

	it("200 - Establishment Aggregate & Form deleted with back office JWT", async () => {
	it("204 - Establishment Aggregate & Form deleted with back office JWT", async () => {

En tant qu'admin je peux supprimer une entreprise #425

En tant qu'admin je peux supprimer une entreprise #425

Conversation

bbohec commented Jul 6, 2023

bbohec commented Aug 8, 2023

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment