Tech - Stocker searchable_by dans searches made et nettoyage des données dans search_made__appellations_code

back/src/config/pg/kysely/model/database.ts

@@ -516,6 +516,7 @@ interface SearchesMade extends WithAcquisition {
  lon: number | null;
  distance: number | null;
  gps: string | null;
+ searchable_by: "jobSeekers" | "students" | null;
 }
 
 interface UsersAgencies {

back/src/config/pg/migrations/1726826257133_add-searchable-by-column-in-searches-made.ts

@@ -0,0 +1,23 @@
+import { MigrationBuilder } from "node-pg-migrate";
+
+export async function up(pgm: MigrationBuilder): Promise<void> {
+ pgm.createType("searchable_by", ["students", "jobSeekers"]);
+ pgm.addColumn("searches_made", {
+ searchable_by: { type: "searchable_by" },
+ });
+
+ await pgm.db.query(`
+ DELETE FROM searches_made__appellation_code where appellation_code is null;
+ `);
+ pgm.alterColumn("searches_made__appellation_code", "appellation_code", {
+ notNull: true,
+ });
+}
+
+export async function down(pgm: MigrationBuilder): Promise<void> {
+ pgm.dropColumn("searches_made", "searchable_by");
+ pgm.dropType("searchable_by");
+ pgm.alterColumn("searches_made__appellation_code", "appellation_code", {
+ notNull: false,
+ });
+}

back/src/domains/establishment/adapters/PgSearchMadeRepository.ts

@@ -14,7 +14,7 @@ export class PgSearchMadeRepository implements SearchMadeRepository {
  public async insertSearchMade(searchMade: SearchMadeEntity) {
  await this.#insertSearchMade(searchMade);
 
- if (searchMade.appellationCodes) {
+ if (searchMade.appellationCodes && searchMade.appellationCodes.length > 0) {
  await this.#insertAppellationCodes(
  searchMade.id,
  searchMade.appellationCodes,
@@ -34,6 +34,7 @@ export class PgSearchMadeRepository implements SearchMadeRepository {
  sorted_by: searchMade.sortedBy,
  address: searchMade.place,
  number_of_results: searchMade.numberOfResults,
+ searchable_by: searchMade.establishmentSearchableBy,
  acquisition_keyword: searchMade.acquisitionKeyword,
  acquisition_campaign: searchMade.acquisitionCampaign,
  ...(hasSearchMadeGeoParams(searchMade)

back/src/domains/establishment/use-cases/SearchImmersion.ts

@@ -93,7 +93,7 @@ export class SearchImmersion extends TransactionalUseCase<
  needsToBeSearched: true,
  apiConsumerName: apiConsumer?.name,
  numberOfResults:
- voluntaryToImmersion !== false
+ voluntaryToImmersion !== false // cases where voluntaryToImmersion is undefined and true
  ? repositorySearchResults.length
  : lbbSearchResults.length,
  });