fix: enabling weights on RR events breaks atoms (#20297)

* fix: enabling weights on RR events breaks atoms

* Update find-team-members-matching-attribute.input.ts

* refactor: Extract team member processing logic into separate hook

* Update find-team-members-matching-attribute.input.ts

* moved `TeamMemberDto` and `FindTeamMembersMatchingAttributeOutputDto`  to platform-types

* `team-members.output.ts` -> `team-members-attributes.output.ts`

* upgrade platform-libraries
This commit is contained in:
Somay Chauhan
2025-04-07 12:11:19 +05:30
committed by GitHub
parent 1fb4147940
commit d158a1e007
14 changed files with 327 additions and 67 deletions
@@ -2,6 +2,7 @@ import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_0
import { SchedulesRepository_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.repository";
import { AtomsRepository } from "@/modules/atoms/atoms.repository";
import { AtomsController } from "@/modules/atoms/controllers/atoms.controller";
import { AttributesAtomsService } from "@/modules/atoms/services/attributes-atom.service";
import { ConferencingAtomsService } from "@/modules/atoms/services/conferencing-atom.service";
import { EventTypesAtomService } from "@/modules/atoms/services/event-types-atom.service";
import { CredentialsRepository } from "@/modules/credentials/credentials.repository";
@@ -19,6 +20,7 @@ import { Module } from "@nestjs/common";
providers: [
EventTypesAtomService,
ConferencingAtomsService,
AttributesAtomsService,
MembershipsRepository,
CredentialsRepository,
UsersRepository,
@@ -3,6 +3,8 @@ import {
BulkUpdateEventTypeToDefaultLocationDto,
EventTypesAppInput,
} from "@/modules/atoms/inputs/event-types-app.input";
import { FindTeamMembersMatchingAttributeQueryDto } from "@/modules/atoms/inputs/find-team-members-matching-attribute.input";
import { AttributesAtomsService } from "@/modules/atoms/services/attributes-atom.service";
import { ConferencingAtomsService } from "@/modules/atoms/services/conferencing-atom.service";
import { EventTypesAtomService } from "@/modules/atoms/services/event-types-atom.service";
import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
@@ -34,6 +36,8 @@ import { ConnectedApps } from "@calcom/platform-libraries/app-store";
import type { UpdateEventTypeReturn } from "@calcom/platform-libraries/event-types";
import { ApiResponse } from "@calcom/platform-types";
import { FindTeamMembersMatchingAttributeResponseDto } from "../outputs/find-team-members-matching-attribute.output";
/*
Endpoints used only by platform atoms, reusing code from other modules, data is already formatted and ready to be used by frontend atoms
@@ -50,7 +54,8 @@ these endpoints should not be recommended for use by third party and are exclude
export class AtomsController {
constructor(
private readonly eventTypesService: EventTypesAtomService,
private readonly conferencingService: ConferencingAtomsService
private readonly conferencingService: ConferencingAtomsService,
private readonly attributesService: AttributesAtomsService
) {}
@Get("event-types/:eventTypeId")
@@ -222,4 +227,25 @@ export class AtomsController {
data: conferencingApps,
};
}
@Get("/organizations/:orgId/teams/:teamId/members-matching-attribute")
@Version(VERSION_NEUTRAL)
@UseGuards(ApiAuthGuard)
async findTeamMembersMatchingAttributes(
@GetUser() user: UserWithProfile,
@Param("teamId", ParseIntPipe) teamId: number,
@Param("orgId", ParseIntPipe) orgId: number,
@Query() query: FindTeamMembersMatchingAttributeQueryDto
): Promise<FindTeamMembersMatchingAttributeResponseDto> {
const result = await this.attributesService.findTeamMembersMatchingAttribute(teamId, orgId, {
attributesQueryValue: query.attributesQueryValue,
isPreview: query.isPreview,
enablePerf: query.enablePerf,
concurrency: query.concurrency,
});
return {
status: SUCCESS_STATUS,
data: result,
};
}
}
@@ -0,0 +1,25 @@
import { ApiPropertyOptional } from "@nestjs/swagger";
import type { TFindTeamMembersMatchingAttributeLogicInputSchema } from "@calcom/platform-libraries";
export class FindTeamMembersMatchingAttributeQueryDto {
@ApiPropertyOptional({
nullable: true,
})
attributesQueryValue: TFindTeamMembersMatchingAttributeLogicInputSchema["attributesQueryValue"];
@ApiPropertyOptional({
type: Boolean,
})
isPreview?: boolean;
@ApiPropertyOptional({
type: Boolean,
})
enablePerf?: boolean;
@ApiPropertyOptional({
type: Number,
})
concurrency?: number;
}
@@ -0,0 +1,19 @@
import { ApiProperty } from "@nestjs/swagger";
import { Expose, Type } from "class-transformer";
import { IsString, ValidateNested } from "class-validator";
import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
import { FindTeamMembersMatchingAttributeOutputDto } from "@calcom/platform-types";
export class FindTeamMembersMatchingAttributeResponseDto {
@ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
@IsString()
@Expose()
readonly status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
@ValidateNested()
@Type(() => FindTeamMembersMatchingAttributeOutputDto)
@Expose()
@ApiProperty({ type: FindTeamMembersMatchingAttributeOutputDto })
readonly data!: FindTeamMembersMatchingAttributeOutputDto;
}
@@ -0,0 +1,64 @@
import { UsersRepository } from "@/modules/users/users.repository";
import { Logger } from "@nestjs/common";
import { Injectable } from "@nestjs/common";
import { findTeamMembersMatchingAttributeLogic } from "@calcom/platform-libraries";
import { FindTeamMembersMatchingAttributeQueryDto } from "../inputs/find-team-members-matching-attribute.input";
@Injectable()
export class AttributesAtomsService {
private logger = new Logger("AttributesAtomService");
constructor(private readonly usersRepository: UsersRepository) {}
async findTeamMembersMatchingAttribute(
teamId: number,
orgId: number,
input: FindTeamMembersMatchingAttributeQueryDto
) {
const {
teamMembersMatchingAttributeLogic: matchingTeamMembersWithResult,
mainAttributeLogicBuildingWarnings: mainWarnings,
fallbackAttributeLogicBuildingWarnings: fallbackWarnings,
troubleshooter,
} = await findTeamMembersMatchingAttributeLogic(
{
teamId,
orgId,
attributesQueryValue: input.attributesQueryValue,
},
{
enablePerf: input.enablePerf,
concurrency: input.concurrency,
enableTroubleshooter: input.enablePerf,
}
);
if (!matchingTeamMembersWithResult) {
return {
troubleshooter,
mainWarnings,
fallbackWarnings,
result: null,
};
}
const matchingTeamMembersIds = matchingTeamMembersWithResult.map(
(member: { userId: number }) => member.userId
);
const matchingTeamMembers = await this.usersRepository.findByIds(matchingTeamMembersIds);
return {
mainWarnings,
fallbackWarnings,
troubleshooter: troubleshooter,
result: matchingTeamMembers.map((user) => ({
id: user.id,
name: user.name,
email: user.email,
})),
};
}
}