diff --git a/packages/backend/src/modules/repositories/Config.ts b/packages/backend/src/modules/repositories/Config.ts index a4a56cd..39d8bda 100644 --- a/packages/backend/src/modules/repositories/Config.ts +++ b/packages/backend/src/modules/repositories/Config.ts @@ -3,12 +3,10 @@ import type { ConfigEntity } from "@/modules/entities/Config"; export class ConfigRepository extends EntityRepository { async set(name: string, value: string) { - await this.upsert({ + return await this.upsert({ name, value, }); - - return; } async get(name: string, defaultValue?: string) { diff --git a/packages/backend/src/routes/setup/create-admin.ts b/packages/backend/src/routes/setup/create-admin.ts index 64b65e5..ffbe2eb 100755 --- a/packages/backend/src/routes/setup/create-admin.ts +++ b/packages/backend/src/routes/setup/create-admin.ts @@ -3,7 +3,6 @@ import logger from "@/lib/logger"; import type { FastifyInstance } from "fastify"; import { UserRepository } from "@/modules/repositories/User"; import { DatabaseError, ErrorBase, InputError } from "@/errors"; -import { ConfigEntity } from "@/modules/entities/Config"; export default function CreateAdmin(fastify: FastifyInstance) { fastify.post("/", async (req, res) => { @@ -15,22 +14,6 @@ export default function CreateAdmin(fastify: FastifyInstance) { return res.code(400).send(InputError(result.error.issues)); } - try { - const configCount = await fastify.orm.em.count(ConfigEntity); - - if (configCount === 0) { - return res.code(409).send(ErrorBase({ - bad: "client", - code: "yet_initialization", - message: "初期設定が行われていません。", - })); - } - } catch (err) { - logger.error("Database Error: Could not check if already initialization:", err); - - return res.code(500).send(DatabaseError()); - } - try { const userCount = await fastify.orm.em.getRepository(UserEntity).count(); diff --git a/packages/backend/src/routes/setup/initialization.ts b/packages/backend/src/routes/setup/initialization.ts index 3dd7496..a3d2435 100644 --- a/packages/backend/src/routes/setup/initialization.ts +++ b/packages/backend/src/routes/setup/initialization.ts @@ -46,12 +46,12 @@ export default function Initialization(fastify: FastifyInstance) { const entries = Object.entries(result.data).filter(([key]) => key !== "force"); for (const [key, value] of entries) { - const entity = fastify.orm.em.create(ConfigEntity, { - name: key, - value: typeof value === "string" + const entity = fastify.orm.em.getRepository(ConfigEntity).set( + key, + typeof value === "string" ? value - : String(value), - }); + : String(value) + ); fastify.orm.em.persist(entity); }