Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 59 additions & 64 deletions packages/backend/src/_migrations/1755523274895-auto-migration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,86 +6,81 @@
public async up(queryRunner: QueryRunner): Promise<void> {
console.log("🚀 Starting password type migration");

const cutoffDate = "2024-08-15";
// Ajout de la colonne passwordType
await queryRunner.query(`
ALTER TABLE "user_usager"
ADD COLUMN "passwordType" text
`);

// Initial stats
const initialStats = await queryRunner.query(
`
SELECT
COUNT(*) as totalAccounts,
COUNT(*) FILTER (WHERE "createdAt" >= $1) as createdAfterCutoff,
COUNT(*) FILTER (WHERE "createdAt" < $1) as createdBeforeCutoff,
COUNT(*) FILTER (WHERE "isTemporaryPassword" = true) as temporaryPasswords,
COUNT(*) FILTER (WHERE "isTemporaryPassword" = false) as personalPasswords
FROM user_usager
`,
[cutoffDate]
);
const initialStats = await queryRunner.query(`
SELECT
COUNT(*) as "totalAccounts",
COUNT(*) FILTER (WHERE "isTemporaryPassword" = true) as "temporaryPasswords",
COUNT(*) FILTER (WHERE "isTemporaryPassword" = false) as "personalPasswords"
FROM user_usager
`);

console.log(`📊 Initial stats:`, initialStats[0]);

// Update RANDOM (isTemporaryPassword = true AND created after cutoff)
const randomUpdates = await queryRunner.query(
`
UPDATE user_usager
SET "passwordType" = 'RANDOM'
WHERE "isTemporaryPassword" = true
AND "createdAt" >= $1
`,
[cutoffDate]
);

console.log(
`✅ Set ${randomUpdates.affectedRows || 0} accounts to RANDOM type`
);

// Update BIRTH_DATE (isTemporaryPassword = true AND created before cutoff)
const birthDateUpdates = await queryRunner.query(
`
UPDATE user_usager
SET "passwordType" = 'BIRTH_DATE'
WHERE "isTemporaryPassword" = true
AND "createdAt" < $1
`,
[cutoffDate]
);

console.log(
`✅ Set ${birthDateUpdates.affectedRows || 0} accounts to BIRTH_DATE type`
);

// Update PERSONAL (isTemporaryPassword = false)
const personalUpdates = await queryRunner.query(`
UPDATE user_usager
SET "passwordType" = 'PERSONAL'
WHERE "isTemporaryPassword" = false
`);

console.log(
`✅ Set ${personalUpdates.affectedRows || 0} accounts to PERSONAL type`
);
// Update RANDOM pour tous les mots de passe temporaires
const randomResult = await queryRunner.query(`
UPDATE user_usager
SET "passwordType" = 'RANDOM'
WHERE "isTemporaryPassword" = true
`);

console.log(`✅ Set ${randomResult[1]} accounts to RANDOM type`);

// Update PERSONAL pour tous les mots de passe personnels
const personalResult = await queryRunner.query(`
UPDATE user_usager
SET "passwordType" = 'PERSONAL'
WHERE "isTemporaryPassword" = false
`);

console.log(`✅ Set ${personalResult[1]} accounts to PERSONAL type`);

// Verification qu'aucun compte n'a passwordType NULL
const nullPasswordTypes = await queryRunner.query(`
SELECT COUNT(*) as "nullCount"
FROM user_usager
WHERE "passwordType" IS NULL
`);

if (nullPasswordTypes[0].nullCount > 0) {
throw new Error(
`❌ Migration failed: ${nullPasswordTypes[0].nullCount} accounts still have NULL passwordType`
);
}

// Final verification
const finalStats = await queryRunner.query(`
SELECT
"passwordType",
COUNT(*) as count
FROM user_usager
GROUP BY "passwordType"
ORDER BY "passwordType"
`);
SELECT
"passwordType",
COUNT(*) as count
FROM user_usager
GROUP BY "passwordType"
ORDER BY "passwordType"
`);

console.log("📊 Final distribution:");
finalStats.forEach((stat) => {
console.log(` ${stat.passwordType || "NULL"}: ${stat.count} accounts`);
console.log(` ${stat.passwordType}: ${stat.count} accounts`);
});

// Rendre la colonne NOT NULL maintenant qu'elle est peuplée
await queryRunner.query(`
ALTER TABLE "user_usager"
ALTER COLUMN "passwordType" SET NOT NULL
`);

console.log("🎉 Password type migration completed!");
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "user_usager" DROP COLUMN "passwordType"`
);
await queryRunner.query(`
ALTER TABLE "user_usager" DROP COLUMN "passwordType"
`);
}
}
19 changes: 6 additions & 13 deletions packages/backend/src/_migrations/1755523274896-auto-migration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,14 @@ export class AutoMigration1755523274896 implements MigrationInterface {
for (const user of accountExistingButDisabledUsers) {
try {
await queryRunner.query(
`
UPDATE usager
SET options = jsonb_set(
COALESCE(options, '{}'),
'{portailUsagerEnabled}',
'true'::jsonb
)
WHERE uuid = $1
`,
` UPDATE usager SET options = jsonb_set( COALESCE(options, '{}'), '{portailUsagerEnabled}', 'true'::jsonb ) WHERE uuid = $1`,
[user.uuid]
);

console.log(
`✅ accountExistingButDisabled: Portal enabled for UUID: ${user.uuid}`
);
if (accountExistingButDisabledUpdatedCount % 200 === 0) {
console.log(
`#️⃣ ${accountExistingButDisabledUpdatedCount} / ${accountExistingButDisabledUsers.length}`
);
}
accountExistingButDisabledUpdatedCount++;
} catch (error) {
console.error(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ import {
InteractionsService,
interactionsCreator,
} from "./services";
import { PageOptionsDto } from "../../usagers/dto/pagination";
import {
PageMetaDto,
PageOptionsDto,
PageResultsDto,
} from "../../usagers/dto/pagination";
import { CommonInteraction, Usager } from "@domifa/common";
CommonInteraction,
Usager,
PageMeta,
PageResults,
} from "@domifa/common";
import { MessageSmsService } from "../sms/services/message-sms.service";

@UseGuards(AuthGuard("jwt"), AppUserGuard)
Expand Down Expand Up @@ -117,8 +118,11 @@ export class InteractionsController {

const itemCount = await queryBuilder.getCount();
const entities = await queryBuilder.getRawMany();
const pageMetaDto = new PageMetaDto({ itemCount, pageOptionsDto });
return new PageResultsDto(entities, pageMetaDto);
const pageMetaDto = new PageMeta({
itemCount,
pageOptions: pageOptionsDto,
});
return new PageResults({ data: entities, meta: pageMetaDto });
}

@UseGuards(UsagerAccessGuard, InteractionsGuard)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import { Injectable } from "@nestjs/common";
import { interactionRepository } from "../../../database";
import {
PageMetaDto,
PageOptionsDto,
PageResultsDto,
} from "../../../usagers/dto";
import { PageOptionsDto } from "../../../usagers/dto";
import { In, IsNull, Not } from "typeorm";
import { INTERACTIONS_IN } from "@domifa/common";
import { INTERACTIONS_IN, PageMeta, PageResults } from "@domifa/common";

@Injectable()
export class InteractionsService {
Expand Down Expand Up @@ -36,8 +32,12 @@ export class InteractionsService {

const itemCount = await queryBuilder.getCount();
const entities = await queryBuilder.getRawMany();
const pageMetaDto = new PageMetaDto({ itemCount, pageOptionsDto });
return new PageResultsDto(entities, pageMetaDto);

const pageMetaDto = new PageMeta({
itemCount,
pageOptions: pageOptionsDto,
});
return new PageResults({ data: entities, meta: pageMetaDto });
}

public async searchPendingInteractionsWithContent(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import {
UsagersCountByStatus,
UserUsager,
UserUsagerWithUsagerInfo,
PageMeta,
PageResults,
} from "@domifa/common";
import {
Body,
Expand Down Expand Up @@ -43,11 +45,7 @@ import {
} from "../../dto";
import { AppLogsService } from "../../../app-logs/app-logs.service";
import { userUsagerCreator } from "../../services";
import {
PageMetaDto,
PageOptionsDto,
PageResultsDto,
} from "../../../../usagers/dto";
import { PageOptionsDto } from "../../../../usagers/dto";
import { format } from "date-fns";
import * as XLSX from "xlsx";

Expand Down Expand Up @@ -340,15 +338,19 @@ export class PortailUsagersManagerController {
public async getAllAccounts(
@Body() pageOptionsDto: PageOptionsDto,
@CurrentUser() currentUser: UserStructureAuthenticated
): Promise<PageResultsDto<UserUsagerWithUsagerInfo>> {
): Promise<PageResults<UserUsagerWithUsagerInfo>> {
const { itemCount, entities } =
await userUsagerRepository.getAccountsWithUsagerInfo(
currentUser,
pageOptionsDto,
false
);
const pageMetaDto = new PageMetaDto({ itemCount, pageOptionsDto });
return new PageResultsDto(entities, pageMetaDto);

const pageMetaDto = new PageMeta({
itemCount,
pageOptions: pageOptionsDto,
});
return new PageResults({ data: entities, meta: pageMetaDto });
}

@UseGuards(UsagerAccessGuard)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
expectedResponseStatusBuilder,
} from "../../_tests";
import { AppTestContext, AppTestHttpClient } from "../../util/test";
import { PageOptions } from "@domifa/common";

////////////////// IMPORTANT //////////////////
//
Expand All @@ -19,8 +20,9 @@ export const SmsControllerSecurityTests: AppTestHttpClientSecurityTestDef[] = [
label: `${CONTROLLER}.getUsagerSms`,
query: async (context: AppTestContext) => {
return {
response: await AppTestHttpClient.get(`/sms/usager/4444444`, {
response: await AppTestHttpClient.post(`/sms/usager/4444444`, {
context,
body: new PageOptions(),
}),
expectedStatus: expectedResponseStatusBuilder.allowStructureOnly(
context.user,
Expand Down
41 changes: 28 additions & 13 deletions packages/backend/src/modules/sms/sms.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Usager } from "@domifa/common";
import { Controller, UseGuards, Get } from "@nestjs/common";
import { PageMeta, PageResults, Usager } from "@domifa/common";
import { Controller, UseGuards, Post, Body } from "@nestjs/common";
import { AuthGuard } from "@nestjs/passport";
import { ApiTags, ApiBearerAuth } from "@nestjs/swagger";
import { USER_STRUCTURE_ROLE_ALL } from "../../_common/model";
Expand All @@ -10,6 +10,7 @@ import {
} from "../../auth/decorators";
import { AppUserGuard, UsagerAccessGuard } from "../../auth/guards";
import { messageSmsRepository } from "../../database";
import { PageOptionsDto } from "../../usagers/dto";

@Controller("sms")
@UseGuards(AuthGuard("jwt"), AppUserGuard)
Expand All @@ -19,18 +20,32 @@ import { messageSmsRepository } from "../../database";
export class SmsController {
@ApiBearerAuth()
@UseGuards(UsagerAccessGuard)
@Get("usager/:usagerRef")
public async getUsagerSms(@CurrentUsager() currentUsager: Usager) {
return await messageSmsRepository.find({
where: {
usagerRef: currentUsager.ref,
@Post("usager/:usagerRef")
public async getUsagerSms(
@CurrentUsager() currentUsager: Usager,
@Body() pageOptionsDto: PageOptionsDto
) {
const queryBuilder = messageSmsRepository
.createQueryBuilder("message_sms")
.where("message_sms.structureId = :structureId", {
structureId: currentUsager.structureId,
},
order: {
createdAt: "DESC",
},
skip: 0,
take: 50,
})
.andWhere("message_sms.usagerRef = :usagerRef", {
usagerRef: currentUsager.ref,
})
.orderBy("createdAt", pageOptionsDto.order)
.skip(pageOptionsDto.skip)
.take(pageOptionsDto.take);

const [entities, itemCount] = await Promise.all([
queryBuilder.getMany(),
queryBuilder.getCount(),
]);

const pageMetaDto = new PageMeta({
itemCount,
pageOptions: pageOptionsDto,
});
return new PageResults({ data: entities, meta: pageMetaDto });
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import {
UsagerNote,
Usager,
UsagerPinnedNote,
PageMeta,
PageResults,
} from "@domifa/common";
import { CreateNoteDto } from "../dto/create-note.dto";
import {
Expand All @@ -37,12 +39,13 @@ import {
} from "../../database";
import { CurrentUsagerNote } from "../../auth/decorators/current-usager-note.decorator";
import { AppUserGuard, UsagerNoteAccessGuard } from "../../auth/guards";
import { PageResultsDto, PageMetaDto, PageOptionsDto } from "../dto/pagination";

import { ObjectLiteral } from "typeorm";
import {
AllowUserProfiles,
AllowUserStructureRoles,
} from "../../auth/decorators";
import { PageOptionsDto } from "../dto";

@ApiTags("usagers-notes")
@ApiBearerAuth()
Expand Down Expand Up @@ -80,8 +83,11 @@ export class UsagerNotesController {

const itemCount = await queryBuilder.getCount();
const { entities } = await queryBuilder.getRawAndEntities();
const pageMetaDto = new PageMetaDto({ itemCount, pageOptionsDto });
return new PageResultsDto(entities, pageMetaDto);
const pageMetaDto = new PageMeta({
itemCount,
pageOptions: pageOptionsDto,
});
return new PageResults({ data: entities, meta: pageMetaDto });
}

@UseGuards(UsagerAccessGuard)
Expand Down
Loading
Loading