Skip to content

Commit

Permalink
remove participant creation partial
Browse files Browse the repository at this point in the history
  • Loading branch information
ashleysmithTTD committed Nov 25, 2024
1 parent e9fbbc5 commit 0823387
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 50 deletions.
7 changes: 0 additions & 7 deletions src/api/entities/Participant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,6 @@ export const ParticipantSchema = z.object({
crmAgreementNumber: z.string().nullable(),
});

export const ParticipantCreationPartial = ParticipantSchema.pick({
name: true,
}).extend({
types: z.array(ParticipantTypeSchema.pick({ id: true })),
users: z.array(UserCreationPartial).optional(),
});

export const ParticipantApprovalPartial = ParticipantSchema.pick({
siteId: true,
name: true,
Expand Down
12 changes: 2 additions & 10 deletions src/api/routers/participants/participantsCreation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ import { z } from 'zod';
import { getRoleNamesByIds } from '../../../web/utils/apiRoles';
import { ApiRole } from '../../entities/ApiRole';
import { AuditAction, AuditTrailEvents } from '../../entities/AuditTrail';
import {
Participant,
ParticipantCreationPartial,
ParticipantStatus,
} from '../../entities/Participant';
import { Participant, ParticipantStatus } from '../../entities/Participant';
import { User, UserCreationPartial } from '../../entities/User';
import { UserRoleId } from '../../entities/UserRole';
import { UserToParticipantRole } from '../../entities/UserToParticipantRole';
Expand All @@ -25,11 +21,7 @@ import {
performAsyncOperationWithAuditTrail,
} from '../../services/auditTrailService';
import { doesUserExistInKeycloak } from '../../services/kcUsersService';
import {
getParticipantTypesByIds,
ParticipantRequest,
sendNewParticipantEmail,
} from '../../services/participantsService';
import { getParticipantTypesByIds, ParticipantRequest } from '../../services/participantsService';
import {
createAndInviteKeycloakUser,
findUserByEmail,
Expand Down
27 changes: 0 additions & 27 deletions src/api/services/participantsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { AuditAction, AuditTrailEvents } from '../entities/AuditTrail';
import {
Participant,
ParticipantApprovalPartial,
ParticipantCreationPartial,
ParticipantDTO,
ParticipantStatus,
} from '../entities/Participant';
Expand Down Expand Up @@ -52,32 +51,6 @@ export const getParticipantTypesByIds = async (
return ParticipantType.query().findByIds(participantTypeIds);
};

export const sendNewParticipantEmail = async (
newParticipant: z.infer<typeof ParticipantCreationPartial>,
typeIds: number[],
traceId: string
) => {
const participantTypes = await getParticipantTypesByIds(typeIds);
const emailService = createEmailService();
const requestor = newParticipant.users![0];
const templateData = {
participant: newParticipant.name,
participantType: participantTypes.map((pt) => pt.typeName).join(', '),
requestor: `${requestor.firstName} ${requestor.lastName}`,
requestorEmail: requestor.email,
jobFunction: requestor.jobFunction,
};

const uid2SupportUsers = await getAllUid2SupportUsers();
const emailArgs: EmailArgs = {
subject: 'New Participant Request',
templateData,
template: 'newParticipantReadyForReview',
to: uid2SupportUsers.map((user) => ({ name: user!.firstName, email: user!.email })),
};
emailService.sendEmail(emailArgs, traceId);
};

export const mapParticipantToApprovalRequest = (
participant: Participant
): ParticipantRequestDTO => {
Expand Down
9 changes: 3 additions & 6 deletions src/web/services/participant.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import axios, { AxiosError, isAxiosError } from 'axios';
import { KeycloakProfile } from 'keycloak-js';
import axios, { AxiosError } from 'axios';
import { z } from 'zod';

import { ApiRoleDTO } from '../../api/entities/ApiRole';
import { BusinessContactSchema } from '../../api/entities/BusinessContact';
import { ParticipantCreationPartial, ParticipantDTO } from '../../api/entities/Participant';
import { ParticipantDTO } from '../../api/entities/Participant';
import { SignedParticipantDTO } from '../../api/entities/SignedParticipant';
import {
ApiKeyDTO,
Expand All @@ -14,9 +13,7 @@ import {
} from '../../api/services/adminServiceHelpers';
import { ParticipantRequestDTO } from '../../api/services/participantsService';
import { backendError } from '../utils/apiError';
import { InviteTeamMemberForm, UserPayload } from './userAccount';

export type ParticipantCreationPayload = z.infer<typeof ParticipantCreationPartial>;
import { InviteTeamMemberForm } from './userAccount';

export const isCreateParticipantError = (error: unknown): error is CreateParticipantError => {
return (
Expand Down

0 comments on commit 0823387

Please sign in to comment.