awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-19 00:30:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Requested changes

Browse Source
This commit is contained in:
Daniel Hougaard
2024-06-24 19:11:58 +02:00
parent 2d98560255
commit c735beea32
6 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/super-admin/super-admin-dal.ts
+20 -6
View File
@@ -1,14 +1,16 @@
import { Knex } from "knex";
import { TDbClient } from "@app/db";
import { TableName, TSuperAdmin } from "@app/db/schemas";
import { TableName, TSuperAdmin, TSuperAdminUpdate } from "@app/db/schemas";
import { ormify } from "@app/lib/knex";
export type TSuperAdminDALFactory = ReturnType<typeof superAdminDALFactory>;
export const superAdminDALFactory = (db: TDbClient) => {
const orm = ormify(db, TableName.SuperAdmin);
const superAdminOrm = ormify(db, TableName.SuperAdmin);
const findById = async (id: string) => {
const config = await db(TableName.SuperAdmin)
const findById = async (id: string, tx?: Knex) => {
const config = await (tx || db)(TableName.SuperAdmin)
.where(`${TableName.SuperAdmin}.id`, id)
.leftJoin(TableName.Organization, `${TableName.SuperAdmin}.defaultAuthOrgId`, `${TableName.Organization}.id`)
.select(
@@ -23,8 +25,20 @@ export const superAdminDALFactory = (db: TDbClient) => {
} as TSuperAdmin & { defaultAuthOrgSlug: string | null };
};
const updateById = async (id: string, data: TSuperAdminUpdate, tx?: Knex) => {
const updatedConfig = await superAdminOrm.transaction(async (trx) => {
await superAdminOrm.updateById(id, data, tx || trx);
const config = await findById(id, tx || trx);
return config;
});
return updatedConfig;
};
return {
...orm,
findById
...superAdminOrm,
findById,
updateById
};
};