chore(deps): update drizzle-orm to 0.45.2 and pg to 8.20.0
This commit is contained in:
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
import { drizzle } from "npm:drizzle-orm/node-postgres";
|
import { drizzle } from "npm:drizzle-orm@0.45.2/node-postgres";
|
||||||
import pg from "npm:pg";
|
import pg from "npm:pg@8.20.0";
|
||||||
|
|
||||||
const { Pool } = pg;
|
const { Pool } = pg;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ import {
|
|||||||
primaryKey,
|
primaryKey,
|
||||||
serial,
|
serial,
|
||||||
text,
|
text,
|
||||||
} from "npm:drizzle-orm/pg-core";
|
} from "npm:drizzle-orm@0.45.2/pg-core";
|
||||||
|
|
||||||
export const roles = pgTable("roles", {
|
export const roles = pgTable("roles", {
|
||||||
id: serial("id").primaryKey(),
|
id: serial("id").primaryKey(),
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts";
|
|||||||
import { db } from "$root/databases/db.ts";
|
import { db } from "$root/databases/db.ts";
|
||||||
import { rolePermissions, roles } from "$root/databases/schema.ts";
|
import { rolePermissions, roles } from "$root/databases/schema.ts";
|
||||||
import { AuthenticatedState } from "$root/defaults/interfaces.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(
|
async function getRoleWithPermissions(
|
||||||
id: number,
|
id: number,
|
||||||
@@ -20,7 +20,11 @@ async function getRoleWithPermissions(
|
|||||||
.from(rolePermissions)
|
.from(rolePermissions)
|
||||||
.where(eq(rolePermissions.idRole, id));
|
.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<null, AuthenticatedState> = {
|
export const handler: Handlers<null, AuthenticatedState> = {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts";
|
|||||||
import { db } from "$root/databases/db.ts";
|
import { db } from "$root/databases/db.ts";
|
||||||
import { rolePermissions, roles } from "$root/databases/schema.ts";
|
import { rolePermissions, roles } from "$root/databases/schema.ts";
|
||||||
import { AuthenticatedState } from "$root/defaults/interfaces.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(
|
const NOT_FOUND = new Response(
|
||||||
JSON.stringify({ error: "Ressource introuvable" }),
|
JSON.stringify({ error: "Ressource introuvable" }),
|
||||||
@@ -25,7 +25,11 @@ async function getRoleWithPermissions(
|
|||||||
.from(rolePermissions)
|
.from(rolePermissions)
|
||||||
.where(eq(rolePermissions.idRole, id));
|
.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<null, AuthenticatedState> = {
|
export const handler: Handlers<null, AuthenticatedState> = {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts";
|
|||||||
import { db } from "$root/databases/db.ts";
|
import { db } from "$root/databases/db.ts";
|
||||||
import { users } from "$root/databases/schema.ts";
|
import { users } from "$root/databases/schema.ts";
|
||||||
import { AuthenticatedState } from "$root/defaults/interfaces.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<null, AuthenticatedState> = {
|
export const handler: Handlers<null, AuthenticatedState> = {
|
||||||
// #60 GET /users
|
// #60 GET /users
|
||||||
@@ -42,14 +42,21 @@ export const handler: Handlers<null, AuthenticatedState> = {
|
|||||||
|
|
||||||
if (existing) {
|
if (existing) {
|
||||||
return new Response(
|
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" } },
|
{ status: 409, headers: { "content-type": "application/json" } },
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const [created] = await db
|
const [created] = await db
|
||||||
.insert(users)
|
.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();
|
.returning();
|
||||||
|
|
||||||
return new Response(JSON.stringify(created), {
|
return new Response(JSON.stringify(created), {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts";
|
|||||||
import { db } from "$root/databases/db.ts";
|
import { db } from "$root/databases/db.ts";
|
||||||
import { users } from "$root/databases/schema.ts";
|
import { users } from "$root/databases/schema.ts";
|
||||||
import { AuthenticatedState } from "$root/defaults/interfaces.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(
|
const NOT_FOUND = new Response(
|
||||||
JSON.stringify({ error: "Ressource introuvable" }),
|
JSON.stringify({ error: "Ressource introuvable" }),
|
||||||
@@ -33,8 +33,8 @@ export const handler: Handlers<null, AuthenticatedState> = {
|
|||||||
request: Request,
|
request: Request,
|
||||||
context: FreshContext<AuthenticatedState>,
|
context: FreshContext<AuthenticatedState>,
|
||||||
): Promise<Response> {
|
): Promise<Response> {
|
||||||
const body: { nom: string; prenom: string; idRole: number } =
|
const body: { nom: string; prenom: string; idRole: number } = await request
|
||||||
await request.json();
|
.json();
|
||||||
|
|
||||||
const [updated] = await db
|
const [updated] = await db
|
||||||
.update(users)
|
.update(users)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import {
|
|||||||
import { FreshContext } from "$fresh/server.ts";
|
import { FreshContext } from "$fresh/server.ts";
|
||||||
import { State } from "$root/routes/_middleware.ts";
|
import { State } from "$root/routes/_middleware.ts";
|
||||||
|
|
||||||
export async function Index(request: Request, context: FreshContext<State>) {
|
export function Index(_request: Request, _context: FreshContext<State>) {
|
||||||
return <h2>Welcome to Admin.</h2>;
|
return <h2>Welcome to Admin.</h2>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { Handlers } from "$fresh/server.ts";
|
import { Handlers } from "$fresh/server.ts";
|
||||||
import { db } from "$root/databases/db.ts";
|
import { db } from "$root/databases/db.ts";
|
||||||
import { mobility, promotions, students } from "$root/databases/schema.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 = {
|
export const handler: Handlers = {
|
||||||
async GET() {
|
async GET() {
|
||||||
@@ -21,7 +21,11 @@ export const handler: Handlers = {
|
|||||||
const mobilityRows = await db.select().from(mobility);
|
const mobilityRows = await db.select().from(mobility);
|
||||||
|
|
||||||
const promotionRows = await db
|
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);
|
.from(promotions);
|
||||||
|
|
||||||
return new Response(
|
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) {
|
} catch (error) {
|
||||||
console.error("Error inserting mobility data:", error);
|
console.error("Error inserting mobility data:", error);
|
||||||
return new Response("Failed to insert/update data", { status: 500 });
|
return new Response("Failed to insert/update data", { status: 500 });
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { FreshContext, Handlers } from "$fresh/server.ts";
|
|||||||
import { db } from "$root/databases/db.ts";
|
import { db } from "$root/databases/db.ts";
|
||||||
import { promotions } from "$root/databases/schema.ts";
|
import { promotions } from "$root/databases/schema.ts";
|
||||||
import { AuthenticatedState } from "$root/defaults/interfaces.ts";
|
import { AuthenticatedState } from "$root/defaults/interfaces.ts";
|
||||||
import { eq } from "npm:drizzle-orm";
|
|
||||||
|
|
||||||
export const handler: Handlers<null, AuthenticatedState> = {
|
export const handler: Handlers<null, AuthenticatedState> = {
|
||||||
// #13 GET /promotions
|
// #13 GET /promotions
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts";
|
|||||||
import { db } from "$root/databases/db.ts";
|
import { db } from "$root/databases/db.ts";
|
||||||
import { promotions } from "$root/databases/schema.ts";
|
import { promotions } from "$root/databases/schema.ts";
|
||||||
import { AuthenticatedState } from "$root/defaults/interfaces.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(
|
const NOT_FOUND = new Response(
|
||||||
JSON.stringify({ error: "Ressource introuvable" }),
|
JSON.stringify({ error: "Ressource introuvable" }),
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts";
|
|||||||
import { db } from "$root/databases/db.ts";
|
import { db } from "$root/databases/db.ts";
|
||||||
import { students } from "$root/databases/schema.ts";
|
import { students } from "$root/databases/schema.ts";
|
||||||
import { AuthenticatedState } from "$root/defaults/interfaces.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<null, AuthenticatedState> = {
|
export const handler: Handlers<null, AuthenticatedState> = {
|
||||||
// #7 GET /students
|
// #7 GET /students
|
||||||
@@ -37,8 +37,12 @@ export const handler: Handlers<null, AuthenticatedState> = {
|
|||||||
return new Response(null, { status: 403 });
|
return new Response(null, { status: 403 });
|
||||||
}
|
}
|
||||||
|
|
||||||
const body: { numEtud: number; nom: string; prenom: string; idPromo: string } =
|
const body: {
|
||||||
await request.json();
|
numEtud: number;
|
||||||
|
nom: string;
|
||||||
|
prenom: string;
|
||||||
|
idPromo: string;
|
||||||
|
} = await request.json();
|
||||||
|
|
||||||
if (!body.nom || !body.prenom || !body.idPromo) {
|
if (!body.nom || !body.prenom || !body.idPromo) {
|
||||||
return new Response(null, { status: 400 });
|
return new Response(null, { status: 400 });
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { FreshContext, Handlers } from "$fresh/server.ts";
|
|||||||
import { db } from "$root/databases/db.ts";
|
import { db } from "$root/databases/db.ts";
|
||||||
import { students } from "$root/databases/schema.ts";
|
import { students } from "$root/databases/schema.ts";
|
||||||
import { AuthenticatedState } from "$root/defaults/interfaces.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(
|
const NOT_FOUND = new Response(
|
||||||
JSON.stringify({ error: "Ressource introuvable" }),
|
JSON.stringify({ error: "Ressource introuvable" }),
|
||||||
@@ -45,8 +45,8 @@ export const handler: Handlers<null, AuthenticatedState> = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const numEtud = Number(context.params.numEtud);
|
const numEtud = Number(context.params.numEtud);
|
||||||
const body: { nom: string; prenom: string; idPromo: string } =
|
const body: { nom: string; prenom: string; idPromo: string } = await request
|
||||||
await request.json();
|
.json();
|
||||||
|
|
||||||
const [updated] = await db
|
const [updated] = await db
|
||||||
.update(students)
|
.update(students)
|
||||||
|
|||||||
Reference in New Issue
Block a user