RabbitLabs/vylbot-app
RabbitLabs/vylbot-app
5
0
Fork 0
Code Issues 90 Pull requests 4 Projects 1 Releases 22 Packages Wiki Activity Actions

Add list moons command #449

Merged
Vylpes merged 15 commits from feature/195-list-moons into develop 2024-08-17 16:47:14 +01:00
Conversation 0 Commits 15 Files changed 10 +6 -2
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit afbee94a75 - Show all commits

1
database/3.3.0/1719856023429-CreateMoon/Up/01-Moon.sql
View file

@ -5,5 +5,6 @@ CREATE TABLE `moon` (
`MoonNumber` int NOT NULL, `MoonNumber` int NOT NULL,
`UserId` varchar(255) NOT NULL, `UserId` varchar(255) NOT NULL,
`Description` varchar(255) NOT NULL `Description` varchar(255) NOT NULL
`WhenArchived` datetime NULL,
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

7
src/database/entities/Moon.ts
View file

@ -1,4 +1,4 @@
import { Column, Entity } from "typeorm"; import { Column, Entity, IsNull } from "typeorm";
import BaseEntity from "../../contracts/BaseEntity"; import BaseEntity from "../../contracts/BaseEntity";
import AppDataSource from "../dataSources/appDataSource"; import AppDataSource from "../dataSources/appDataSource";
@ -18,6 +18,9 @@ export default class Moon extends BaseEntity {
@Column() @Column()
Description: string; Description: string;
@Column({ nullable: true })
WhenArchived?: Date;
@Column() @Column()
UserId: string; UserId: string;
@ -35,7 +38,7 @@ export default class Moon extends BaseEntity {
const repository = AppDataSource.getRepository(Moon); const repository = AppDataSource.getRepository(Moon);
const moons = await repository.findAndCount({ const moons = await repository.findAndCount({
where: { UserId: userId }, where: { UserId: userId, WhenArchived: IsNull() },
order: { MoonNumber: "ASC" }, order: { MoonNumber: "ASC" },
skip: rangeStart, skip: rangeStart,
take: pageLength, take: pageLength,