sk1982/actaeon
2
5
Fork 3
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

fix: create actaeon user ext before teams

Browse Source
This commit is contained in:
sk1982 2024-04-07 06:44:38 -04:00
parent 1605d921d0
commit cabdc60e27
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/team.ts
View File

@ -1,7 +1,7 @@
import { GeneratedDB, db } from '@/db'; import { GeneratedDB, db } from '@/db';
import { JoinPrivacy, Visibility } from '@/types/privacy-visibility'; import { JoinPrivacy, Visibility } from '@/types/privacy-visibility';
import crypto from 'crypto'; import crypto from 'crypto';
import { userIsVisible, withUsersVisibleTo } from './user'; import { createActaeonUsersFromExistingUsers, userIsVisible, withUsersVisibleTo } from './user';
import { Transaction } from 'kysely'; import { Transaction } from 'kysely';
import { UserPayload } from '@/types/user'; import { UserPayload } from '@/types/user';
import { hasPermission } from '@/helpers/permissions'; import { hasPermission } from '@/helpers/permissions';
@ -38,6 +38,8 @@ export const createActaeonTeamsFromExistingTeams = async () => {
.values(insertValues) .values(insertValues)
.executeTakeFirst(); .executeTakeFirst();
await createActaeonUsersFromExistingUsers(trx).catch(console.error);
for (const val of insertValues) { for (const val of insertValues) {
await trx.updateTable('actaeon_user_ext') await trx.updateTable('actaeon_user_ext')
.where('userId', '=', val.owner) .where('userId', '=', val.owner)

19
src/data/user.ts
View File

@ -1,8 +1,8 @@
import { UserPayload, UserVisibility } from '@/types/user'; import { UserPayload, UserVisibility } from '@/types/user';
import { hasPermission } from '@/helpers/permissions'; import { hasPermission } from '@/helpers/permissions';
import { UserPermissions } from '@/types/permissions'; import { UserPermissions } from '@/types/permissions';
import { sql } from 'kysely'; import { Kysely, Transaction, sql } from 'kysely';
import { db } from '@/db'; import { GeneratedDB, db } from '@/db';
import { jsonObjectArray } from '@/types/json-object-array'; import { jsonObjectArray } from '@/types/json-object-array';
import { parseJsonResult } from '@/helpers/parse-json-result'; import { parseJsonResult } from '@/helpers/parse-json-result';
import { getUser } from '@/actions/auth'; import { getUser } from '@/actions/auth';
@ -93,3 +93,18 @@ export const getUsers = async () => {
}; };
export type AdminUser = Awaited<ReturnType<typeof getUsers>>[number]; export type AdminUser = Awaited<ReturnType<typeof getUsers>>[number];
export const createActaeonUsersFromExistingUsers = async (builder: Transaction<GeneratedDB> | Kysely<GeneratedDB>) => {
await builder.insertInto('actaeon_user_ext')
.columns(['uuid', 'visibility', 'userId'])
.expression(eb => eb.selectFrom('aime_user')
.where(({ not, exists, selectFrom }) => not(exists(selectFrom('actaeon_user_ext')
.whereRef('actaeon_user_ext.userId', '=', 'aime_user.id')
.select('aime_user.id'))))
.select(({ fn, lit }) => [
fn<string>('uuid_v4').as('uuid'),
lit(0).as('visibility'),
'aime_user.id as userId'
]))
.execute();
};