diff --git a/databases/db.ts b/databases/db.ts index b405c39..05326f9 100644 --- a/databases/db.ts +++ b/databases/db.ts @@ -1,5 +1,5 @@ -import { drizzle } from "npm:drizzle-orm/node-postgres"; -import pg from "npm:pg"; +import { drizzle } from "npm:drizzle-orm@0.45.2/node-postgres"; +import pg from "npm:pg@8.20.0"; const { Pool } = pg; diff --git a/databases/schema.ts b/databases/schema.ts index a74b3f1..823c7a2 100644 --- a/databases/schema.ts +++ b/databases/schema.ts @@ -6,7 +6,7 @@ import { primaryKey, serial, text, -} from "npm:drizzle-orm/pg-core"; +} from "npm:drizzle-orm@0.45.2/pg-core"; export const roles = pgTable("roles", { id: serial("id").primaryKey(), diff --git a/routes/(apps)/admin/api/roles.ts b/routes/(apps)/admin/api/roles.ts index 59688c8..15b328a 100644 --- a/routes/(apps)/admin/api/roles.ts +++ b/routes/(apps)/admin/api/roles.ts @@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts"; import { db } from "$root/databases/db.ts"; import { rolePermissions, roles } from "$root/databases/schema.ts"; import { AuthenticatedState } from "$root/defaults/interfaces.ts"; -import { eq } from "npm:drizzle-orm"; +import { eq } from "npm:drizzle-orm@0.45.2"; async function getRoleWithPermissions( id: number, @@ -20,7 +20,11 @@ async function getRoleWithPermissions( .from(rolePermissions) .where(eq(rolePermissions.idRole, id)); - return { id: role.id, nom: role.nom, permissions: perms.map((p) => p.idPermission) }; + return { + id: role.id, + nom: role.nom, + permissions: perms.map((p) => p.idPermission), + }; } export const handler: Handlers = { diff --git a/routes/(apps)/admin/api/roles/[idRole].ts b/routes/(apps)/admin/api/roles/[idRole].ts index 60bf2cc..d29d047 100644 --- a/routes/(apps)/admin/api/roles/[idRole].ts +++ b/routes/(apps)/admin/api/roles/[idRole].ts @@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts"; import { db } from "$root/databases/db.ts"; import { rolePermissions, roles } from "$root/databases/schema.ts"; import { AuthenticatedState } from "$root/defaults/interfaces.ts"; -import { eq } from "npm:drizzle-orm"; +import { eq } from "npm:drizzle-orm@0.45.2"; const NOT_FOUND = new Response( JSON.stringify({ error: "Ressource introuvable" }), @@ -25,7 +25,11 @@ async function getRoleWithPermissions( .from(rolePermissions) .where(eq(rolePermissions.idRole, id)); - return { id: role.id, nom: role.nom, permissions: perms.map((p) => p.idPermission) }; + return { + id: role.id, + nom: role.nom, + permissions: perms.map((p) => p.idPermission), + }; } export const handler: Handlers = { diff --git a/routes/(apps)/admin/api/users.ts b/routes/(apps)/admin/api/users.ts index 931795a..d2fbd56 100644 --- a/routes/(apps)/admin/api/users.ts +++ b/routes/(apps)/admin/api/users.ts @@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts"; import { db } from "$root/databases/db.ts"; import { users } from "$root/databases/schema.ts"; import { AuthenticatedState } from "$root/defaults/interfaces.ts"; -import { eq } from "npm:drizzle-orm"; +import { eq } from "npm:drizzle-orm@0.45.2"; export const handler: Handlers = { // #60 GET /users @@ -42,14 +42,21 @@ export const handler: Handlers = { if (existing) { return new Response( - JSON.stringify({ error: "Un utilisateur avec cet identifiant existe déjà" }), + JSON.stringify({ + error: "Un utilisateur avec cet identifiant existe déjà", + }), { status: 409, headers: { "content-type": "application/json" } }, ); } const [created] = await db .insert(users) - .values({ id: body.id, nom: body.nom, prenom: body.prenom, idRole: body.idRole }) + .values({ + id: body.id, + nom: body.nom, + prenom: body.prenom, + idRole: body.idRole, + }) .returning(); return new Response(JSON.stringify(created), { diff --git a/routes/(apps)/admin/api/users/[id].ts b/routes/(apps)/admin/api/users/[id].ts index 81c5871..236156c 100644 --- a/routes/(apps)/admin/api/users/[id].ts +++ b/routes/(apps)/admin/api/users/[id].ts @@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts"; import { db } from "$root/databases/db.ts"; import { users } from "$root/databases/schema.ts"; import { AuthenticatedState } from "$root/defaults/interfaces.ts"; -import { eq } from "npm:drizzle-orm"; +import { eq } from "npm:drizzle-orm@0.45.2"; const NOT_FOUND = new Response( JSON.stringify({ error: "Ressource introuvable" }), @@ -33,8 +33,8 @@ export const handler: Handlers = { request: Request, context: FreshContext, ): Promise { - const body: { nom: string; prenom: string; idRole: number } = - await request.json(); + const body: { nom: string; prenom: string; idRole: number } = await request + .json(); const [updated] = await db .update(users) diff --git a/routes/(apps)/admin/partials/index.tsx b/routes/(apps)/admin/partials/index.tsx index 12adb8d..4e0c915 100644 --- a/routes/(apps)/admin/partials/index.tsx +++ b/routes/(apps)/admin/partials/index.tsx @@ -5,7 +5,7 @@ import { import { FreshContext } from "$fresh/server.ts"; import { State } from "$root/routes/_middleware.ts"; -export async function Index(request: Request, context: FreshContext) { +export function Index(_request: Request, _context: FreshContext) { return

Welcome to Admin.

; } diff --git a/routes/(apps)/mobility/api/insert_mobility.ts b/routes/(apps)/mobility/api/insert_mobility.ts index 0452d26..a6e9aa9 100644 --- a/routes/(apps)/mobility/api/insert_mobility.ts +++ b/routes/(apps)/mobility/api/insert_mobility.ts @@ -1,7 +1,7 @@ import { Handlers } from "$fresh/server.ts"; import { db } from "$root/databases/db.ts"; import { mobility, promotions, students } from "$root/databases/schema.ts"; -import { eq } from "npm:drizzle-orm"; +import { eq } from "npm:drizzle-orm@0.45.2"; export const handler: Handlers = { async GET() { @@ -21,7 +21,11 @@ export const handler: Handlers = { const mobilityRows = await db.select().from(mobility); const promotionRows = await db - .select({ id: promotions.id, endyear: promotions.endyear, current: promotions.current }) + .select({ + id: promotions.id, + endyear: promotions.endyear, + current: promotions.current, + }) .from(promotions); return new Response( @@ -107,7 +111,9 @@ export const handler: Handlers = { }); } - return new Response("Data inserted/updated successfully", { status: 200 }); + return new Response("Data inserted/updated successfully", { + status: 200, + }); } catch (error) { console.error("Error inserting mobility data:", error); return new Response("Failed to insert/update data", { status: 500 }); diff --git a/routes/(apps)/students/api/promotions.ts b/routes/(apps)/students/api/promotions.ts index 83b318c..8e87820 100644 --- a/routes/(apps)/students/api/promotions.ts +++ b/routes/(apps)/students/api/promotions.ts @@ -2,7 +2,6 @@ import { FreshContext, Handlers } from "$fresh/server.ts"; import { db } from "$root/databases/db.ts"; import { promotions } from "$root/databases/schema.ts"; import { AuthenticatedState } from "$root/defaults/interfaces.ts"; -import { eq } from "npm:drizzle-orm"; export const handler: Handlers = { // #13 GET /promotions diff --git a/routes/(apps)/students/api/promotions/[idPromo].ts b/routes/(apps)/students/api/promotions/[idPromo].ts index 25d71f3..a206d3a 100644 --- a/routes/(apps)/students/api/promotions/[idPromo].ts +++ b/routes/(apps)/students/api/promotions/[idPromo].ts @@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts"; import { db } from "$root/databases/db.ts"; import { promotions } from "$root/databases/schema.ts"; import { AuthenticatedState } from "$root/defaults/interfaces.ts"; -import { eq } from "npm:drizzle-orm"; +import { eq } from "npm:drizzle-orm@0.45.2"; const NOT_FOUND = new Response( JSON.stringify({ error: "Ressource introuvable" }), diff --git a/routes/(apps)/students/api/students.ts b/routes/(apps)/students/api/students.ts index 2c09757..65ed62d 100644 --- a/routes/(apps)/students/api/students.ts +++ b/routes/(apps)/students/api/students.ts @@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts"; import { db } from "$root/databases/db.ts"; import { students } from "$root/databases/schema.ts"; import { AuthenticatedState } from "$root/defaults/interfaces.ts"; -import { eq } from "npm:drizzle-orm"; +import { eq } from "npm:drizzle-orm@0.45.2"; export const handler: Handlers = { // #7 GET /students @@ -37,8 +37,12 @@ export const handler: Handlers = { return new Response(null, { status: 403 }); } - const body: { numEtud: number; nom: string; prenom: string; idPromo: string } = - await request.json(); + const body: { + numEtud: number; + nom: string; + prenom: string; + idPromo: string; + } = await request.json(); if (!body.nom || !body.prenom || !body.idPromo) { return new Response(null, { status: 400 }); diff --git a/routes/(apps)/students/api/students/[numEtud].ts b/routes/(apps)/students/api/students/[numEtud].ts index bf0e64f..3d92371 100644 --- a/routes/(apps)/students/api/students/[numEtud].ts +++ b/routes/(apps)/students/api/students/[numEtud].ts @@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts"; import { db } from "$root/databases/db.ts"; import { students } from "$root/databases/schema.ts"; import { AuthenticatedState } from "$root/defaults/interfaces.ts"; -import { eq } from "npm:drizzle-orm"; +import { eq } from "npm:drizzle-orm@0.45.2"; const NOT_FOUND = new Response( JSON.stringify({ error: "Ressource introuvable" }), @@ -45,8 +45,8 @@ export const handler: Handlers = { } const numEtud = Number(context.params.numEtud); - const body: { nom: string; prenom: string; idPromo: string } = - await request.json(); + const body: { nom: string; prenom: string; idPromo: string } = await request + .json(); const [updated] = await db .update(students)