Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions apps/rpc/src/modules/group/group-repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ export interface GroupRepository {
findManyByType(handle: DBHandle, groupType: GroupType): Promise<Group[]>
findManyByUserId(handle: DBHandle, userId: UserId): Promise<Group[]>

findGroupMembershipById(handle: DBHandle, groupMembershipId: GroupMembershipId): Promise<GroupMembership | null>
findGroupMembersByRoleType(handle: DBHandle, groupSlug: GroupId, roleType: GroupRoleType): Promise<GroupMember[]>
findManyGroupMemberships(handle: DBHandle, groupSlug: GroupId, userId?: UserId): Promise<GroupMembership[]>
createGroupMembership(
handle: DBHandle,
groupMembershipData: GroupMembershipWrite,
Expand All @@ -44,9 +47,11 @@ export interface GroupRepository {
groupMembershipData: GroupMembershipWrite,
groupRoleIds: Set<GroupRoleId>
): Promise<GroupMembership>
findGroupMembershipById(handle: DBHandle, groupMembershipId: GroupMembershipId): Promise<GroupMembership | null>
findGroupMembersByRoleType(handle: DBHandle, groupSlug: GroupId, roleType: GroupRoleType): Promise<GroupMember[]>
findManyGroupMemberships(handle: DBHandle, groupSlug: GroupId, userId?: UserId): Promise<GroupMembership[]>
deleteGroupMemberships(handle: DBHandle, groupMembershipIds: GroupMembershipId[]): Promise<void>
createManyGroupMemberships(
handle: DBHandle,
groupMembershipData: (GroupMembershipWrite & { roleIds: Set<GroupRoleId> })[]
): Promise<void>

createGroupRoles(handle: DBHandle, groupRolesData: GroupRoleWrite[]): Promise<GroupRole[]>
updateGroupRole(
Expand Down Expand Up @@ -353,6 +358,29 @@ export function getGroupRepository(): GroupRepository {

return parseOrReport(GroupRoleSchema, row)
},

async deleteGroupMemberships(handle, groupMembershipIds) {
await handle.groupMembership.deleteMany({
where: {
id: {
in: groupMembershipIds,
},
},
})
},

async createManyGroupMemberships(handle, groupMembershipData) {
await handle.groupMembership.createMany({
data: groupMembershipData.map(({ roleIds, ...membershipData }) => ({
...membershipData,
roles: {
createMany: {
data: [roleIds].map((roleId) => ({ roleId })),
},
},
})),
})
},
}
}

Expand Down
153 changes: 152 additions & 1 deletion apps/rpc/src/modules/group/group-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,21 @@ import {
type UserId,
getDefaultGroupMemberRoles,
GROUP_IMAGE_MAX_SIZE_KIB,
areGroupRolesEqual,
} from "@dotkomonline/types"
import { createS3PresignedPost, getCurrentUTC, slugify } from "@dotkomonline/utils"
import { areIntervalsOverlapping, compareDesc } from "date-fns"
import { areIntervalsOverlapping, compareDesc, isAfter, isEqual } from "date-fns"
import { maxTime } from "date-fns/constants"
import invariant from "tiny-invariant"
import { FailedPreconditionError, NotFoundError } from "../../error"
import type { UserService } from "../user/user-service"
import type { GroupRepository } from "./group-repository"
import { Stripe } from "stripe"
import Error = module
import { a, b } from "vitest/dist/chunks/suite.d.FvehnV49"
import Error = module
import * as crypto from "node:crypto"
import { s3Client } from "../../../vitest-integration.setup"

export interface GroupService {
create(handle: DBHandle, data: GroupWrite): Promise<Group>
Expand Down Expand Up @@ -72,6 +79,16 @@ export interface GroupService {
groupMembershipData: GroupMembershipWrite,
groupRoleIds: Set<GroupRoleId>
): Promise<GroupMembership>
deleteManyGroupMemberships(handle: DBHandle, groupMembershipIds: GroupMembershipId[]): Promise<void>
createManyGroupMemberships(
handle: DBHandle,
groupMembershipData: (GroupMembershipWrite & { roleIds: Set<GroupRoleId> })[]
): Promise<void>
/**
* Reduces the array of memberships to its simplest form, removing overlapping memberships and merging memberships
* which could be merged.
*/
simplifyMemberships(memberships: [GroupMembership, ...GroupMembership[]]): Promise<GroupMembership[]>

createRole(handle: DBHandle, groupRoleData: GroupRoleWrite): Promise<GroupRole>
updateRole(handle: DBHandle, groupRoleId: GroupRoleId, groupRoleData: GroupRoleWrite): Promise<GroupRole>
Expand Down Expand Up @@ -318,6 +335,41 @@ export function getGroupService(
return await groupRepository.updateGroupRole(handle, groupRoleId, groupRoleData)
},

async simplifyMemberships(memberships) {
const membershipsByGroup = new Map<string, GroupMembership[]>()

for (const membership of memberships) {
const existing = membershipsByGroup.get(membership.groupId)
if (existing) {
existing.push(membership)
} else {
membershipsByGroup.set(membership.groupId, [membership])
}
}

const results: GroupMembership[] = []

for (const groupMemberships of membershipsByGroup.values()) {
const simplified = simplifyMembershipsForGroup(groupMemberships)
results.push(...simplified)
}

return results
},

createManyGroupMemberships(
handle: DBHandle,
groupMembershipData: (GroupMembershipWrite & {
roleIds: Set<GroupRoleId>
})[]
): Promise<void> {
return Promise.resolve(undefined)
},

deleteManyGroupMemberships(handle: DBHandle, groupMembershipIds: GroupMembershipId[]): Promise<void> {
return Promise.resolve(undefined)
},

async createFileUpload(filename, contentType, createdByUserId) {
const uuid = crypto.randomUUID()
const key = `group/${Date.now()}-${uuid}-${slugify(filename)}`
Expand All @@ -332,3 +384,102 @@ export function getGroupService(
},
}
}

type Segment = {
start: Date
end: Date | null
roles: GroupRole[]
sourceMembership: GroupMembership
}

function simplifyMembershipsForGroup(memberships: GroupMembership[]): GroupMembership[] {
const hasOngoingMembership = memberships.some((membership) => membership.end === null)

// This set collects membership boundary points so we can recreate segments for merging roles into.
const boundarySet = new Set<number>()

for (const membership of memberships) {
boundarySet.add(membership.start.getTime())
if (membership.end !== null) {
boundarySet.add(membership.end.getTime())
}
}

const sortedBoundaries = [...boundarySet].toSorted((a, b) => a - b).map((timestamp) => new Date(timestamp))

const segments: Segment[] = []

for (let i = 0; i < sortedBoundaries.length; i++) {
const segmentStart = sortedBoundaries[i]
const isLastBoundary = i === sortedBoundaries.length - 1

if (isLastBoundary && !hasOngoingMembership) {
break
}

const segmentEnd = isLastBoundary ? null : sortedBoundaries[i + 1]

const activeRolesInSegment: GroupRole[] = []
let sourceMembership: GroupMembership | null = null

for (const membership of memberships) {
const isSegmentStartContained = !isAfter(membership.start, segmentStart)
const isSegmentEndContained = membership.end === null || isAfter(membership.end, segmentStart)

if (isSegmentStartContained && isSegmentEndContained) {
activeRolesInSegment.push(...membership.roles)

if (sourceMembership === null) {
sourceMembership = membership
}
}
}

if (activeRolesInSegment.length === 0 || sourceMembership === null) {
continue
}

const uniqueRolesById = new Map<string, GroupRole>()
for (const role of activeRolesInSegment) {
if (!uniqueRolesById.has(role.id)) {
uniqueRolesById.set(role.id, role)
}
}

segments.push({
start: segmentStart,
end: segmentEnd,
roles: [...uniqueRolesById.values()],
sourceMembership,
})
}

const mergedSegments: Segment[] = []

for (const segment of segments) {
const previousSegment = mergedSegments.length > 0 ? mergedSegments[mergedSegments.length - 1] : null

const canMergeWithPrevious =
previousSegment !== null &&
previousSegment.end !== null &&
isEqual(previousSegment.end, segment.start) &&
areGroupRolesEqual(previousSegment.roles, segment.roles)

if (canMergeWithPrevious && previousSegment !== null) {
previousSegment.end = segment.end
} else {
mergedSegments.push({ ...segment })
}
}

return mergedSegments.map((segment) => ({
id: segment.sourceMembership.id,
createdAt: segment.sourceMembership.createdAt,
updatedAt: segment.sourceMembership.updatedAt,
start: segment.start,
end: segment.end,
userId: segment.sourceMembership.userId,
groupId: segment.sourceMembership.groupId,
roles: segment.roles,
}))
}
Loading
Loading