From 54c87b93139e4b948296710e90435897fdd77a36 Mon Sep 17 00:00:00 2001 From: Aster Fialla Date: Sun, 1 Mar 2026 17:16:52 -0500 Subject: [PATCH] new migration matching model names I want --- database/entity/Member.ts | 4 ++-- database/entity/System.ts | 4 ++-- database/migrations/1772399846644-update.ts | 16 ---------------- database/migrations/1772402512992-update.ts | 16 ++++++++++++++++ src/repositories/memberRepository.js | 17 +++++++---------- 5 files changed, 27 insertions(+), 30 deletions(-) delete mode 100644 database/migrations/1772399846644-update.ts create mode 100644 database/migrations/1772402512992-update.ts diff --git a/database/entity/Member.ts b/database/entity/Member.ts index cb78e91..f7696ec 100644 --- a/database/entity/Member.ts +++ b/database/entity/Member.ts @@ -1,7 +1,7 @@ import { Entity, PrimaryGeneratedColumn, Column } from "typeorm" -@Entity({synchronize: true}) -export class Members { +@Entity({name: "Member", synchronize: true}) +export class Member { @PrimaryGeneratedColumn() id: number diff --git a/database/entity/System.ts b/database/entity/System.ts index f5a1fd8..01708ca 100644 --- a/database/entity/System.ts +++ b/database/entity/System.ts @@ -1,7 +1,7 @@ import { Entity, PrimaryGeneratedColumn, Column } from "typeorm" -@Entity({synchronize: true}) -export class Systems { +@Entity({name: "System", synchronize: true}) +export class System { @PrimaryGeneratedColumn() id: number diff --git a/database/migrations/1772399846644-update.ts b/database/migrations/1772399846644-update.ts deleted file mode 100644 index cb12f24..0000000 --- a/database/migrations/1772399846644-update.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; - -export class Update1772399846644 implements MigrationInterface { - name = 'Update1772399846644' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`CREATE TABLE "members" ("id" SERIAL NOT NULL, "userid" character varying NOT NULL, "name" character varying(100) NOT NULL, "displayname" character varying(100), "proxy" character varying, "propic" character varying, "createdAt" TIMESTAMP NOT NULL, "updatedAt" TIMESTAMP NOT NULL, CONSTRAINT "PK_28b53062261b996d9c99fa12404" PRIMARY KEY ("id"))`); - await queryRunner.query(`CREATE TABLE "systems" ("id" SERIAL NOT NULL, "userid" character varying NOT NULL, "fronter" character varying NOT NULL, "grouptag" character varying NOT NULL, "autoproxy" boolean NOT NULL, "createdAt" TIMESTAMP NOT NULL, "updatedAt" TIMESTAMP NOT NULL, CONSTRAINT "PK_aec3139aedeb09c5ae27f2c94d3" PRIMARY KEY ("id"))`); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DROP TABLE "systems"`); - await queryRunner.query(`DROP TABLE "members"`); - } - -} diff --git a/database/migrations/1772402512992-update.ts b/database/migrations/1772402512992-update.ts new file mode 100644 index 0000000..edfe955 --- /dev/null +++ b/database/migrations/1772402512992-update.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class Update1772402512992 implements MigrationInterface { + name = 'Update1772402512992' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`CREATE TABLE "System" ("id" SERIAL NOT NULL, "userid" character varying NOT NULL, "fronter" character varying NOT NULL, "grouptag" character varying NOT NULL, "autoproxy" boolean NOT NULL, "createdAt" TIMESTAMP NOT NULL, "updatedAt" TIMESTAMP NOT NULL, CONSTRAINT "PK_b8e3f6855de5a4758fcb59e5567" PRIMARY KEY ("id"))`); + await queryRunner.query(`CREATE TABLE "Member" ("id" SERIAL NOT NULL, "userid" character varying NOT NULL, "name" character varying(100) NOT NULL, "displayname" character varying(100), "proxy" character varying, "propic" character varying, "createdAt" TIMESTAMP NOT NULL, "updatedAt" TIMESTAMP NOT NULL, CONSTRAINT "PK_235428a1d87c5f639ef7b7cf170" PRIMARY KEY ("id"))`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`DROP TABLE "Member"`); + await queryRunner.query(`DROP TABLE "System"`); + } + +} diff --git a/src/repositories/memberRepository.js b/src/repositories/memberRepository.js index 125fbbf..08d2970 100644 --- a/src/repositories/memberRepository.js +++ b/src/repositories/memberRepository.js @@ -1,21 +1,19 @@ const Member = require("../../database/entity/Member"); const { AppDataSource } = require("../../database/data-source"); const {ILike} = require("typeorm"); -const members = AppDataSource.getRepository(Member.Members) +const members = AppDataSource.getRepository(Member.Member) const memberRepo = {}; - /** * Gets a member based on the author and proxy tag. * * @async * @param {string} authorId - The author of the message. * @param {string} memberName - The member's name. - * @returns {Promise} The member object or null if not found. + * @returns {Promise} The member object or null if not found. */ memberRepo.getMemberByName = async function (authorId, memberName) { - const member = await members.findOneBy({where: {userid: authorId, name: ILike(`%${memberName}%`)}}); - return member.generatedMaps; + return await members.findOne({where: {userid: authorId, name: ILike(`%${memberName}%`)}}); } /** @@ -23,7 +21,7 @@ memberRepo.getMemberByName = async function (authorId, memberName) { * * @async * @param {string} authorId - The author of the message - * @returns {Promise} The member object array. + * @returns {Promise} The member object array. */ memberRepo.getMembersByAuthor = async function (authorId) { return await members.findBy({userid: authorId}); @@ -53,14 +51,13 @@ memberRepo.removeMember = async function (authorId, memberName) { * * @async * @param {{name: string, userid: string, displayname: (string|null), proxy: (string|null), propic: (string|null)}} createObj - Object with parameters in it - * @returns {Promise} A successful inserted object. + * @returns {Promise} A successful inserted object. * @throws {Error} When the member already exists, there are validation errors, or adding a member doesn't work. */ memberRepo.createMember = async function (createObj) { - const member = members.insert({ + return members.insert({ name: createObj.name, userid: createObj.authorId, displayname: createObj.displayName, proxy: createObj.proxy, propic: createObj.propic }); - return member.generatedMaps; } /** @@ -75,7 +72,7 @@ memberRepo.createMember = async function (createObj) { * @throws {Error} When no member row was updated. */ memberRepo.updateMemberValue = async function (authorId, memberName, columnName, value) { - const updated = members.update({columnName: value}, { + const updated = await members.update({[columnName]: value}, { where: { name: ILike(`%${memberName}%`), userid: authorId