Skip to content

Commit

Permalink
Fix backend build (due to drizzle upgrade)
Browse files Browse the repository at this point in the history
  • Loading branch information
farnoux committed Dec 20, 2024
1 parent 4a5ceee commit a47cf7d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 35 deletions.
14 changes: 10 additions & 4 deletions backend/src/fiches/models/axe.table.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
import { InferInsertModel } from 'drizzle-orm';
import { integer, pgTable, serial, text } from 'drizzle-orm/pg-core';
import {
AnyPgColumn,
integer,
pgTable,
serial,
text,
} from 'drizzle-orm/pg-core';
import { createSelectSchema } from 'drizzle-zod';
import { collectiviteTable } from '../../collectivites/models/collectivite.table';
import { panierTable } from '../../panier/models/panier.table';
import { createdAt, modifiedAt, modifiedBy } from '../../utils/column.utils';
import { planActionTypeTable } from './plan-action-type.table';

export const axeTable: ReturnType<typeof pgTable> = pgTable('axe', {
export const axeTable = pgTable('axe', {
id: serial('id').primaryKey(),
nom: text('nom'),
collectiviteId: integer('collectivite_id')
.notNull()
.references(() => collectiviteTable.id),
parent: integer('parent').references(() => axeTable.id),
plan: integer('plan').references(() => axeTable.id),
parent: integer('parent').references((): AnyPgColumn => axeTable.id),
plan: integer('plan').references((): AnyPgColumn => axeTable.id),
type: integer('type').references(() => planActionTypeTable.id),
createdAt,
modifiedAt,
Expand Down
31 changes: 0 additions & 31 deletions backend/src/fiches/services/axe.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Injectable, Logger } from '@nestjs/common';
import DatabaseService from '../../common/services/database.service';
import { and, eq, isNull, or } from 'drizzle-orm';
import { axeTable, CreateAxeType } from '../models/axe.table';
import { ficheActionAxeTable } from '../models/fiche-action-axe.table';

Expand All @@ -26,36 +25,6 @@ export default class AxeService {
return axeCree[0]?.id;
}

/**
* Retourne l'identifiant d'un axe s'il existe déjà ou le crée
* Un axe existe déjà si : même nom, même collectivité, et même axe parent
* @param axe
* @return identifiant de l'axe récupéré ou créé
*/
async createOrReturnAxeId(axe: CreateAxeType): Promise<number> {
const axeExistants = await this.databaseService.db
.select()
.from(axeTable)
.where(
and(
eq(axeTable.nom, axe.nom.trim()),
eq(axeTable.collectiviteId, axe.collectiviteId),
or(
and(
isNull(axeTable.parent),
isNull(axe.parent ? axe.parent : null)
),
eq(axeTable.parent, axe.parent)
)
)
);
const axeExistant = axeExistants?.length > 0 ? axeExistants[0] : null;
if (!axeExistant) {
return await this.createAxe(axe);
}
return axeExistant.id;
}

/**
* Ajoute une fiche dans un axe
* @param ficheId identifiant de la fiche
Expand Down

0 comments on commit a47cf7d

Please sign in to comment.