feat: complete user management workflow
This commit is contained in:
@@ -7,6 +7,7 @@ import {
|
||||
admissions,
|
||||
beds,
|
||||
elders,
|
||||
joinRequests,
|
||||
memberships,
|
||||
organizations,
|
||||
roles,
|
||||
@@ -14,7 +15,18 @@ import {
|
||||
sessions,
|
||||
systemIncidents,
|
||||
} from "@/modules/core/server/schema";
|
||||
import type { Account, Admission, AppData, FacilityBed, Membership, Organization, Room, Session, SystemIncident } from "@/modules/core/types";
|
||||
import type {
|
||||
Account,
|
||||
Admission,
|
||||
AppData,
|
||||
FacilityBed,
|
||||
JoinRequest,
|
||||
Membership,
|
||||
Organization,
|
||||
Room,
|
||||
Session,
|
||||
SystemIncident,
|
||||
} from "@/modules/core/types";
|
||||
import type { Elder } from "@/modules/elders/types";
|
||||
|
||||
function iso(value: Date): string {
|
||||
@@ -27,6 +39,7 @@ export async function readData(): Promise<AppData> {
|
||||
organizationRows,
|
||||
accountRows,
|
||||
membershipRows,
|
||||
joinRequestRows,
|
||||
sessionRows,
|
||||
elderRows,
|
||||
roomRows,
|
||||
@@ -38,6 +51,17 @@ export async function readData(): Promise<AppData> {
|
||||
database.select().from(organizations).orderBy(desc(organizations.createdAt)),
|
||||
database.select().from(accounts).orderBy(desc(accounts.createdAt)),
|
||||
database.select({ membership: memberships, role: roles }).from(memberships).innerJoin(roles, eq(roles.id, memberships.roleId)),
|
||||
database
|
||||
.select({
|
||||
request: joinRequests,
|
||||
accountName: accounts.name,
|
||||
accountEmail: accounts.email,
|
||||
organizationName: organizations.name,
|
||||
})
|
||||
.from(joinRequests)
|
||||
.innerJoin(accounts, eq(accounts.id, joinRequests.accountId))
|
||||
.innerJoin(organizations, eq(organizations.id, joinRequests.organizationId))
|
||||
.orderBy(desc(joinRequests.createdAt)),
|
||||
database.select().from(sessions).orderBy(desc(sessions.createdAt)),
|
||||
database.select().from(elders).orderBy(desc(elders.createdAt)),
|
||||
database.select().from(rooms).orderBy(desc(rooms.createdAt)),
|
||||
@@ -120,6 +144,20 @@ export async function readData(): Promise<AppData> {
|
||||
};
|
||||
});
|
||||
|
||||
const joinRequestsData: JoinRequest[] = joinRequestRows.map((row) => ({
|
||||
id: row.request.id,
|
||||
accountId: row.request.accountId,
|
||||
accountName: row.accountName,
|
||||
accountEmail: row.accountEmail,
|
||||
organizationId: row.request.organizationId,
|
||||
organizationName: row.organizationName,
|
||||
status: row.request.status,
|
||||
reason: row.request.reason,
|
||||
reviewedByAccountId: row.request.reviewedByAccountId ?? undefined,
|
||||
reviewedAt: row.request.reviewedAt ? iso(row.request.reviewedAt) : undefined,
|
||||
createdAt: iso(row.request.createdAt),
|
||||
}));
|
||||
|
||||
const sessionsData: Session[] = sessionRows.map((row) => ({
|
||||
id: row.id,
|
||||
accountId: row.accountId,
|
||||
@@ -204,6 +242,7 @@ export async function readData(): Promise<AppData> {
|
||||
organizations: organizationsData,
|
||||
accounts: accountsData,
|
||||
memberships: membershipsData,
|
||||
joinRequests: joinRequestsData,
|
||||
sessions: sessionsData,
|
||||
elders: eldersData,
|
||||
rooms: roomsData,
|
||||
|
||||
Reference in New Issue
Block a user