Skip to content

Commit

Permalink
fix(mail): ajout lien #1492 (#1496)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Toub
Toub committed Jul 5, 2021
1 parent ab465be commit 667a39f
Show file tree
Hide file tree
Showing 2 changed files with 129 additions and 65 deletions.
26 changes: 26 additions & 0 deletions _scripts/sql/sum_all_interactions.aggregate.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
-- fait la somme des interactions, et la compare aux totaux dans "lastInteraction"

select u."uuid", agg."usagerRef",agg."structureId",
u."lastInteraction"->'courrierIn' as "li.courrierIn",
coalesce (sum("nbInCreate" - "nbInDelete" - "nbOutCreate" + "nbOutDelete") filter (where agg."globalType" = 'courrier'),0) as "courrierIn",
u."lastInteraction"->'colisIn' as "li.colisIn",
coalesce (sum("nbInCreate" - "nbInDelete" - "nbOutCreate" + "nbOutDelete") filter (where agg."globalType" = 'colis'),0) as "colisIn",
u."lastInteraction"->'recommandeIn' as "li.recommandeIn",
coalesce (sum("nbInCreate" - "nbInDelete" - "nbOutCreate" + "nbOutDelete") filter (where agg."globalType" = 'recommande'),0) as "recommandeIn"
from usager u join (
select "usagerRef", "structureId",
CASE
WHEN type in ('colisIn', 'colisOut') THEN 'colis'
WHEN type in ('courrierIn', 'courrierOut') THEN 'courrier'
WHEN type in ('recommandeIn', 'recommandeOut') THEN 'recommande'
END as "globalType",
coalesce (sum("nbCourrier") filter (where type in ('colisIn', 'courrierIn', 'recommandeIn') and event='create'),0) as "nbInCreate",
coalesce (sum("nbCourrier") filter (where type in ('colisOut', 'courrierOut', 'recommandeOut') and event='create'),0) as "nbOutCreate",
coalesce (sum("nbCourrier") filter (where type in ('colisIn', 'courrierIn', 'recommandeIn') and event='delete'),0) as "nbInDelete",
coalesce (sum("nbCourrier") filter (where type in ('colisOut', 'courrierOut', 'recommandeOut') and event='delete'),0) as "nbOutDelete"
FROM interactions i
where type in ('colisIn', 'courrierIn', 'recommandeIn', 'colisOut', 'courrierOut', 'recommandeOut')
group by "usagerRef", "structureId", "globalType"
) as agg on u.ref = agg."usagerRef" and u."structureId" = agg."structureId"
group by u."uuid", u."createdAt", u."lastInteraction", agg."usagerRef", agg."structureId"
order by u."createdAt";
168 changes: 103 additions & 65 deletions packages/backend/src/interactions/services/InteractionsDeletor.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,79 +30,45 @@ export class InteractionsDeletor {
ref: usagerRef,
});

const interactionToDelete = await interactionRepository.findOne({
const interaction = await interactionRepository.findOne({
id: interactionId,
structureId: user.structureId,
usagerRef,
});

if (!interactionToDelete || interactionToDelete === null) {
if (!interaction || interaction === null) {
throw new HttpException("INTERACTION_NOT_FOUND", HttpStatus.BAD_REQUEST);
}

if (interactionToDelete.type === "npai") {
if (interaction.type === "npai") {
usager.options.npai.actif = false;
usager.options.npai.dateDebut = null;

const delInteraction = await this._deleteOrRestore({
user,
interactionToDelete,
interaction,
});

if (delInteraction) {
return this.usagersService.patch({ uuid: usager.uuid }, usager);
}
}

const len = interactionToDelete.type.length;
const interactionMeta = this.getInteractionMeta(interaction);

const interactionOut =
interactionToDelete.type.substring(len - 3) ===
("Out" as unknown as InteractionType);

const interactionIn =
interactionToDelete.type.substring(len - 2) ===
("In" as unknown as InteractionType);

if (interactionIn) {
if (interactionMeta.interactionIn && interaction.event === "create") {
// Suppression du SMS en file d'attente
const smsToDelete = await this.smsService.deleteSmsInteraction(
usager,
user.structureId,
interactionToDelete
interaction
);

const inType = (interactionToDelete.type.substring(0, len - 2) +
"Out") as unknown as InteractionType;

const last = await interactionRepository.findLastInteraction({
usagerRef: usager.ref,
dateInteraction: interactionToDelete.dateInteraction,
typeInteraction: inType,
user,
isIn: "in",
event: "create",
});

if (!last || last === null) {
if (interactionToDelete.nbCourrier) {
usager.lastInteraction[interactionToDelete.type] =
usager.lastInteraction[interactionToDelete.type] -
interactionToDelete.nbCourrier;
}
}
} else if (interactionOut) {
const inType = interactionToDelete.type.substring(0, len - 3) + "In";

if (interactionToDelete.nbCourrier) {
usager.lastInteraction[inType] =
usager.lastInteraction[inType] + interactionToDelete.nbCourrier;
}
}
// TODO en cas de restauration, recréer le SMS si il n'a pas encore été envoyé?

const deletedInteraction = await this._deleteOrRestore({
user,
interactionToDelete,
interaction,
});

if (deletedInteraction === null || !deletedInteraction) {
Expand All @@ -112,33 +78,62 @@ export class InteractionsDeletor {
);
}

return await this.updateUsagerLastInteraction(user, usager);
return await this.updateUsagerLastInteractionAfterDeleteOrRestoreLast({
user,
usager,
interaction,
interactionMeta,
});
}

private getInteractionMeta(i: Interactions): {
interactionOut: boolean;
interactionIn: boolean;
oppositeType: InteractionType;
} {
const len = i.type.length;

const interactionOut = i.type.substring(len - 3) === "Out";

const interactionIn = i.type.substring(len - 2) === "In";

const oppositeType = (interactionIn
? i.type.substring(0, len - 2) + "Out"
: interactionOut
? i.type.substring(0, len - 3) + "In"
: undefined) as unknown as InteractionType;

return {
interactionOut,
interactionIn,
oppositeType,
};
}

private async _deleteOrRestore({
interactionToDelete,
interaction,
user,
}: {
interactionToDelete: Interactions;
interaction: Interactions;
user: Pick<AppUser, "structureId" | "id" | "nom" | "prenom">;
}) {
if (interactionToDelete.event === "create") {
if (interaction.event === "create") {
// create a "delete" interaction
await this._createDeleteInteraction({
user,
interactionToDelete,
interaction,
});
} else {
// restore deleted interaction
await this._restoreDeleteInteraction({
interactionToDelete,
interaction,
});
}
// delete interaction
const retour = interactionRepository.deleteByCriteria({
id: interactionToDelete.id,
id: interaction.id,
structureId: user.structureId,
usagerRef: interactionToDelete.usagerRef,
usagerRef: interaction.usagerRef,
});

if (!retour || retour === null) {
Expand All @@ -149,42 +144,79 @@ export class InteractionsDeletor {

private _createDeleteInteraction({
user,
interactionToDelete,
interaction,
}: {
user: Pick<AppUser, "structureId" | "id" | "nom" | "prenom">;
interactionToDelete: Interactions;
interaction: Interactions;
}) {
const deleteInteraction = new InteractionsTable({
...interactionToDelete,
...interaction,
uuid: undefined, // generate new uuid
structureId: user.structureId,
userId: user.id,
userName: user.prenom + " " + user.nom,
dateInteraction: new Date(),
event: "delete",
previousValue: interactionToDelete,
previousValue: interaction,
});

return interactionRepository.save(deleteInteraction);
}

private _restoreDeleteInteraction({
interactionToDelete,
interaction,
}: {
interactionToDelete: Interactions;
interaction: Interactions;
}) {
const deleteInteraction = new InteractionsTable(
interactionToDelete.previousValue
);
const deleteInteraction = new InteractionsTable(interaction.previousValue);

return interactionRepository.save(deleteInteraction);
}
private async updateUsagerLastInteraction(
user: Pick<AppUser, "structureId" | "nom" | "prenom" | "id">,
usager: Usager
) {
// Recherche de la dernière date de passage
private async updateUsagerLastInteractionAfterDeleteOrRestoreLast({
user,
usager,
interaction,
interactionMeta,
}: {
user: Pick<AppUser, "structureId" | "nom" | "prenom" | "id">;
usager: Usager;
interaction: Interactions;
interactionMeta: {
interactionOut: boolean;
interactionIn: boolean;
oppositeType: InteractionType;
};
}) {
// TODO prendre en compte le type 'create' ou 'delete'

if (interactionMeta.interactionIn) {
const outType = interactionMeta.oppositeType;

const last = await interactionRepository.findLastInteraction({
usagerRef: usager.ref,
dateInteraction: interaction.dateInteraction,
typeInteraction: outType,
user,
isIn: "in",
event: "create",
});

if (!last || last === null) {
if (interaction.nbCourrier) {
usager.lastInteraction[interaction.type] =
usager.lastInteraction[interaction.type] - interaction.nbCourrier;
}
}
} else if (interactionMeta.interactionOut) {
const inType = interactionMeta.oppositeType;

if (interaction.nbCourrier) {
usager.lastInteraction[inType] =
usager.lastInteraction[inType] + interaction.nbCourrier;
}
}

// Recherche de la dernière date de passage
const lastInteraction = await interactionRepository.findLastInteractionOk({
user,
usager,
Expand All @@ -202,6 +234,12 @@ export class InteractionsDeletor {
usager.lastInteraction.dateInteraction = usager.decision.dateDecision;
}

// recalcul des totaux

// NOTE @toub 2021-06-29: j'ai envisagé de recalculer tous les compteurs (voir fichier `sum_all_interactions.aggregate.sql`)
// mais hélas, ils ne correspondent pas à la valeur qu'on a dans "lastInteraction"
// donc il faudrait mieux revoir le modèle de données

usager.lastInteraction.enAttente =
usager.lastInteraction.courrierIn > 0 ||
usager.lastInteraction.colisIn > 0 ||
Expand Down

0 comments on commit 667a39f

Please sign in to comment.