Skip to content

Commit 4caf178

Browse files
authored
feat(den): add skill hubs and restore den-db migrations (anomalyco#1285)
* feat(den-db): add skill hub schema and own migrations * feat(den-api): add skill hub org routes * fix(den-db): restore drizzle migration workflow Move the Docker Den service onto den-api and repair den-db's Drizzle metadata so skill hub migrations generate incrementally from the package. * refactor(den-db): drop legacy org table aliases --------- Co-authored-by: src-opn <[email protected]>
1 parent 4198f20 commit 4caf178

26 files changed

Lines changed: 3699 additions & 35 deletions

‎ee/apps/den-api/src/middleware/member-teams.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const resolveMemberTeamsMiddleware: MiddlewareHandler<{
1717

1818
const memberTeams = await listTeamsForMember({
1919
organizationId: context.organization.id,
20-
userId: context.currentMember.userId,
20+
memberId: context.currentMember.id,
2121
})
2222

2323
c.set("memberTeams", memberTeams)

‎ee/apps/den-api/src/orgs.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ type UserId = typeof AuthUserTable.$inferSelect.id
1717
type SessionId = typeof AuthSessionTable.$inferSelect.id
1818
type OrgId = typeof OrganizationTable.$inferSelect.id
1919
type MemberRow = typeof MemberTable.$inferSelect
20+
type MemberId = MemberRow["id"]
2021
type InvitationRow = typeof InvitationTable.$inferSelect
2122

2223
export type InvitationStatus = "pending" | "accepted" | "canceled" | "expired"
@@ -61,14 +62,14 @@ export type OrganizationContext = {
6162
updatedAt: Date
6263
}
6364
currentMember: {
64-
id: string
65+
id: MemberId
6566
userId: UserId
6667
role: string
6768
createdAt: Date
6869
isOwner: boolean
6970
}
7071
members: Array<{
71-
id: string
72+
id: MemberId
7273
userId: UserId
7374
role: string
7475
createdAt: Date
@@ -295,14 +296,14 @@ async function acceptInvitation(invitation: InvitationRow, userId: UserId) {
295296
const existingTeamMember = await db
296297
.select({ id: TeamMemberTable.id })
297298
.from(TeamMemberTable)
298-
.where(and(eq(TeamMemberTable.teamId, invitation.teamId), eq(TeamMemberTable.userId, userId)))
299+
.where(and(eq(TeamMemberTable.teamId, invitation.teamId), eq(TeamMemberTable.orgMembershipId, member.id)))
299300
.limit(1)
300301

301302
if (!existingTeamMember[0]) {
302303
await db.insert(TeamMemberTable).values({
303304
id: createDenTypeId("teamMember"),
304305
teamId: invitation.teamId,
305-
userId,
306+
orgMembershipId: member.id,
306307
})
307308
}
308309
}
@@ -659,7 +660,7 @@ export async function getOrganizationContextForUser(input: {
659660

660661
export async function listTeamsForMember(input: {
661662
organizationId: OrgId
662-
userId: UserId
663+
memberId: MemberRow["id"]
663664
}) {
664665
return db
665666
.select({
@@ -671,7 +672,7 @@ export async function listTeamsForMember(input: {
671672
})
672673
.from(TeamMemberTable)
673674
.innerJoin(TeamTable, eq(TeamMemberTable.teamId, TeamTable.id))
674-
.where(and(eq(TeamTable.organizationId, input.organizationId), eq(TeamMemberTable.userId, input.userId)))
675+
.where(and(eq(TeamTable.organizationId, input.organizationId), eq(TeamMemberTable.orgMembershipId, input.memberId)))
675676
.orderBy(asc(TeamTable.createdAt))
676677
}
677678

@@ -699,7 +700,7 @@ export async function removeOrganizationMember(input: {
699700
for (const team of teams) {
700701
await tx
701702
.delete(TeamMemberTable)
702-
.where(and(eq(TeamMemberTable.teamId, team.id), eq(TeamMemberTable.userId, member.userId)))
703+
.where(and(eq(TeamMemberTable.teamId, team.id), eq(TeamMemberTable.orgMembershipId, member.id)))
703704
}
704705

705706
await tx.delete(MemberTable).where(eq(MemberTable.id, member.id))

‎ee/apps/den-api/src/routes/org/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import { registerOrgCoreRoutes } from "./core.js"
44
import { registerOrgInvitationRoutes } from "./invitations.js"
55
import { registerOrgMemberRoutes } from "./members.js"
66
import { registerOrgRoleRoutes } from "./roles.js"
7+
import { registerOrgSkillRoutes } from "./skills.js"
78
import { registerOrgTemplateRoutes } from "./templates.js"
89

910
export function registerOrgRoutes<T extends { Variables: OrgRouteVariables }>(app: Hono<T>) {
1011
registerOrgCoreRoutes(app)
1112
registerOrgInvitationRoutes(app)
1213
registerOrgMemberRoutes(app)
1314
registerOrgRoleRoutes(app)
15+
registerOrgSkillRoutes(app)
1416
registerOrgTemplateRoutes(app)
1517
}

0 commit comments

Comments
 (0)