aknuth/vokabeltraining
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Umstellung auf Date

Browse Source
This commit is contained in:
Andreas Knuth
2025-02-07 17:23:26 -06:00
parent 5b475f197a
commit 5eee7c9ac4
5 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
api/src/app/drizzle.service.ts
View File

@@ -18,7 +18,9 @@ export class DrizzleService {
// },
// },
// });
this.db = drizzle('postgresql://haiky:xieng7Seih@localhost:15432/haiky', {
this.db = drizzle(process.env['DATABASE_URL']!, {
//this.db = drizzle('postgresql://haiky:xieng7Seih@localhost:15432/haiky', {
logger: {
logQuery: (query: string, params: any[]) => {
this.sqlLogger.logQuery(query, params);
@@ -91,7 +93,7 @@ export class DrizzleService {
.update(deck)
.set({
deckname: newDeckname,
updated: sql`CURRENT_TIMESTAMP`, // Setze 'updated' auf CURRENT_TIMESTAMP
updated: new Date(), // Setze 'updated' auf CURRENT_TIMESTAMP
})
.where(and(eq(deck.deckname, oldDeckname), eq(deck.user, user.email)));
return { status: 'success', message: 'Deck renamed successfully' };
@@ -152,7 +154,7 @@ export class DrizzleService {
x2: box.x2,
y1: box.y1,
y2: box.y2,
updated: sql`CURRENT_TIMESTAMP`, // Setze 'updated' auf CURRENT_TIMESTAMP
updated: new Date(), // Setze 'updated' auf CURRENT_TIMESTAMP
})
.where(and(eq(deck.user, user.email), eq(deck.bildid, data.bildid), eq(deck.deckname, data.deckname), eq(deck.id, box.id!!)));
if (result.rowsAffected === 0) {
@@ -185,8 +187,7 @@ export class DrizzleService {
const affectedDecks = await this.db
.select({ deckname: deck.deckname })
.from(deck)
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)))
.all();
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
if (affectedDecks.length === 0) {
throw new HttpException('No entries found for the given image ID', HttpStatus.NOT_FOUND);
@@ -207,8 +208,7 @@ export class DrizzleService {
const existingImages = await this.db
.select()
.from(deck)
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)))
.all();
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
if (existingImages.length === 0) {
throw new HttpException('No entries found for the given image ID', HttpStatus.NOT_FOUND);
@@ -218,7 +218,7 @@ export class DrizzleService {
.update(deck)
.set({
deckname: targetDeckId,
updated: sql`CURRENT_TIMESTAMP`, // Setze 'updated' auf CURRENT_TIMESTAMP
updated: new Date(), // Setze 'updated' auf CURRENT_TIMESTAMP
})
.where(and(eq(deck.bildid, bildid), eq(deck.user, user.email)));
@@ -236,16 +236,11 @@ export class DrizzleService {
throw new HttpException('Deck not found', HttpStatus.NOT_FOUND);
}
// const existingNewDeck = await this.getDeckByName(newDeckname, user);
// if (existingNewDeck.length > 0) {
// throw new HttpException('Deck with the new name already exists', HttpStatus.CONFLICT);
// }
await this.db
.update(deck)
.set({
bildname: newImagename,
updated: sql`CURRENT_TIMESTAMP`, // Setze 'updated' auf CURRENT_TIMESTAMP
updated: new Date(), // Setze 'updated' auf CURRENT_TIMESTAMP
})
.where(and(eq(deck.bildid, bildId), eq(deck.user, user.email)));
return { status: 'success', message: 'Image Entries renamed successfully' };
@@ -262,6 +257,7 @@ export class DrizzleService {
reps?: number;
lapses?: number;
isGraduated?: boolean;
inserted?: string;
},
user: User,
) {
@@ -269,7 +265,8 @@ export class DrizzleService {
if (typeof data.isGraduated === 'boolean') {
updateData.isGraduated = Number(data.isGraduated);
}
updateData.updated = sql`CURRENT_TIMESTAMP`; // Setze 'updated' auf CURRENT_TIMESTAMP
updateData.updated = new Date(); //sql`CURRENT_TIMESTAMP`; // Setze 'updated' auf CURRENT_TIMESTAMP
updateData.inserted = new Date(data.inserted as string);
const result = await this.db
.update(deck)

7
api/src/db/schema.ts
View File

@@ -1,4 +1,3 @@
import { sql } from 'drizzle-orm';
import * as t from 'drizzle-orm/pg-core';
import { pgEnum, pgTable as table } from 'drizzle-orm/pg-core';
@@ -22,8 +21,8 @@ export const deck = table(
lapses: t.integer('lapses'),
isGraduated: t.integer('isgraduated'),
user: t.varchar('user').notNull(),
inserted: t.varchar().default(sql`(CURRENT_TIMESTAMP)`), // Neue Spalte
updated: t.varchar().default(sql`(CURRENT_TIMESTAMP)`), // Neue Spalte
inserted: t.timestamp('inserted', { mode: 'date' }).defaultNow(),
updated: t.timestamp('updated', { mode: 'date' }).defaultNow(),
},
table => [t.uniqueIndex('deck_idx').on(table.id)],
);
@@ -35,6 +34,8 @@ export const users = table(
email: t.varchar().notNull(),
role: rolesEnum().default('guest'),
sign_in_provider: t.varchar('sign_in_provider', { length: 50 }),
inserted: t.timestamp('inserted', { mode: 'date' }).defaultNow(),
updated: t.timestamp('updated', { mode: 'date' }).defaultNow(),
},
table => [t.uniqueIndex('users_idx').on(table.id)],
);