From afbee94a75f2367bf011b7863a123f1dd94a9928 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Thu, 15 Aug 2024 19:27:17 +0100 Subject: [PATCH] Add WhenArchived column --- database/3.3.0/1719856023429-CreateMoon/Up/01-Moon.sql | 1 + src/database/entities/Moon.ts | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/database/3.3.0/1719856023429-CreateMoon/Up/01-Moon.sql b/database/3.3.0/1719856023429-CreateMoon/Up/01-Moon.sql index a2afcbf..e7aecab 100644 --- a/database/3.3.0/1719856023429-CreateMoon/Up/01-Moon.sql +++ b/database/3.3.0/1719856023429-CreateMoon/Up/01-Moon.sql @@ -5,5 +5,6 @@ CREATE TABLE `moon` ( `MoonNumber` int NOT NULL, `UserId` varchar(255) NOT NULL, `Description` varchar(255) NOT NULL + `WhenArchived` datetime NULL, ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; diff --git a/src/database/entities/Moon.ts b/src/database/entities/Moon.ts index b139530..566d1d4 100644 --- a/src/database/entities/Moon.ts +++ b/src/database/entities/Moon.ts @@ -1,4 +1,4 @@ -import { Column, Entity } from "typeorm"; +import { Column, Entity, IsNull } from "typeorm"; import BaseEntity from "../../contracts/BaseEntity"; import AppDataSource from "../dataSources/appDataSource"; @@ -18,6 +18,9 @@ export default class Moon extends BaseEntity { @Column() Description: string; + @Column({ nullable: true }) + WhenArchived?: Date; + @Column() UserId: string; @@ -35,7 +38,7 @@ export default class Moon extends BaseEntity { const repository = AppDataSource.getRepository(Moon); const moons = await repository.findAndCount({ - where: { UserId: userId }, + where: { UserId: userId, WhenArchived: IsNull() }, order: { MoonNumber: "ASC" }, skip: rangeStart, take: pageLength,