Skip to content

Commit e30ff46

Browse files
committed
pending advisor and seed data sabo id strings
1 parent 7a11223 commit e30ff46

File tree

6 files changed

+17
-20
lines changed

6 files changed

+17
-20
lines changed

src/backend/src/prisma/seed-data/reimbursement-requests.seed.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ export const seedReimbursementRequests = async (
13141314
organization,
13151315
new Date('2024-07-15')
13161316
);
1317-
await ReimbursementRequestService.setSaboNumber(rr30.reimbursementRequestId, 12345, users.richieRich, organization);
1317+
await ReimbursementRequestService.setSaboNumber(rr30.reimbursementRequestId, 'abc123', users.richieRich, organization);
13181318
await ReimbursementRequestService.inputReimbursementRequestInSabo(
13191319
rr30.reimbursementRequestId,
13201320
users.richieRich,
@@ -1382,7 +1382,7 @@ export const seedReimbursementRequests = async (
13821382
organization,
13831383
new Date('2024-07-18')
13841384
);
1385-
await ReimbursementRequestService.setSaboNumber(rr31.reimbursementRequestId, 12346, users.mrKrabs, organization);
1385+
await ReimbursementRequestService.setSaboNumber(rr31.reimbursementRequestId, 'sdfkj3', users.mrKrabs, organization);
13861386
await ReimbursementRequestService.inputReimbursementRequestInSabo(
13871387
rr31.reimbursementRequestId,
13881388
users.mrKrabs,
@@ -1450,7 +1450,7 @@ export const seedReimbursementRequests = async (
14501450
organization,
14511451
new Date('2024-06-10')
14521452
);
1453-
await ReimbursementRequestService.setSaboNumber(rr32.reimbursementRequestId, 12340, users.monopolyMan, organization);
1453+
await ReimbursementRequestService.setSaboNumber(rr32.reimbursementRequestId, '324jj', users.monopolyMan, organization);
14541454
await ReimbursementRequestService.inputReimbursementRequestInSabo(
14551455
rr32.reimbursementRequestId,
14561456
users.monopolyMan,
@@ -1523,7 +1523,7 @@ export const seedReimbursementRequests = async (
15231523
organization,
15241524
new Date('2024-05-20')
15251525
);
1526-
await ReimbursementRequestService.setSaboNumber(rr33.reimbursementRequestId, 12335, users.johnBoddy, organization);
1526+
await ReimbursementRequestService.setSaboNumber(rr33.reimbursementRequestId, 'kaljf23', users.johnBoddy, organization);
15271527
await ReimbursementRequestService.inputReimbursementRequestInSabo(
15281528
rr33.reimbursementRequestId,
15291529
users.johnBoddy,
@@ -1596,7 +1596,7 @@ export const seedReimbursementRequests = async (
15961596
organization,
15971597
new Date('2024-05-08')
15981598
);
1599-
await ReimbursementRequestService.setSaboNumber(rr34.reimbursementRequestId, 12330, users.richieRich, organization);
1599+
await ReimbursementRequestService.setSaboNumber(rr34.reimbursementRequestId, 'newklajfd', users.richieRich, organization);
16001600
await ReimbursementRequestService.inputReimbursementRequestInSabo(
16011601
rr34.reimbursementRequestId,
16021602
users.richieRich,

src/backend/src/routes/reimbursement-requests.routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ reimbursementRequestsRouter.get('/pending-advisor/list', ReimbursementRequestCon
157157
reimbursementRequestsRouter.post(
158158
'/pending-advisor/send',
159159
body('saboNumbers').isArray(),
160-
intMinZero(body('saboNumbers.*')),
160+
nonEmptyString(body('saboNumbers.*')),
161161
validateInputs,
162162
ReimbursementRequestController.sendPendingAdvisorList
163163
);

src/backend/src/services/reimbursement-requests.services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ export default class ReimbursementRequestService {
612612
* @param saboNumbers the sabo numbers of the reimbursement requests to send
613613
* @param organizationId the organization the user is currently in
614614
*/
615-
static async sendPendingAdvisorList(sender: User, saboNumbers: number[], organizationId: string) {
615+
static async sendPendingAdvisorList(sender: User, saboNumbers: string[], organizationId: string) {
616616
const organization = await prisma.organization.findUnique({
617617
where: { organizationId },
618618
include: { advisor: true }

src/frontend/src/apis/finance.api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ export const setSaboNumber = async (requestId: string, saboNumber: string) => {
374374
* @param saboNumbers The sabo numbers of the reimbursement requests to request approval for
375375
* @returns the response from the backend
376376
*/
377-
export const sendPendingAdvisorList = (saboNumbers: number[]) => {
377+
export const sendPendingAdvisorList = (saboNumbers: string[]) => {
378378
return axios.post(apiUrls.financeSendPendingAdvisorList(), {
379379
saboNumbers
380380
});

src/frontend/src/hooks/finance.hooks.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,9 +794,9 @@ export const useGetPendingAdvisorList = () => {
794794
* @returns the mutation to send the pending advisor list
795795
*/
796796
export const useSendPendingAdvisorList = () => {
797-
return useMutation<{ message: string }, Error, number[]>(
797+
return useMutation<{ message: string }, Error, string[]>(
798798
['reimbursement-requests', 'send-pending-advisor'],
799-
async (saboNumbers: number[]) => {
799+
async (saboNumbers: string[]) => {
800800
const { data } = await sendPendingAdvisorList(saboNumbers);
801801
return data;
802802
}

src/frontend/src/pages/FinancePage/FinanceComponents/PendingAdvisorListModal.tsx

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const CommaSeparatedNumbersInput = ({
1515
onChange,
1616
error
1717
}: {
18-
value: number[];
19-
onChange: (saboNumbers: number[]) => void;
18+
value: string[];
19+
onChange: (saboNumbers: string[]) => void;
2020
error: Merge<FieldError, (FieldError | undefined)[]> | undefined;
2121
}) => {
2222
const [inputValue, setInputValue] = useState<string>(value.join(', '));
@@ -25,11 +25,8 @@ const CommaSeparatedNumbersInput = ({
2525
const inputValue = e.target.value;
2626
setInputValue(inputValue);
2727

28-
// Split the input string by commas and parse each number
29-
const saboNumbers = inputValue
30-
.split(',')
31-
.map((saboNumber) => parseInt(saboNumber.trim()))
32-
.filter((num) => !isNaN(num)); // Filter out NaN values
28+
// Split the input string by commas
29+
const saboNumbers = inputValue.split(',');
3330

3431
onChange(saboNumbers);
3532
};
@@ -49,12 +46,12 @@ const CommaSeparatedNumbersInput = ({
4946
};
5047

5148
const schema = yup.object().shape({
52-
saboNumbers: yup.array().of(yup.number().required('SABO Number is required')).required('SABO Numbers are required')
49+
saboNumbers: yup.array().of(yup.string().required('SABO Number is required')).required('SABO Numbers are required')
5350
});
5451

5552
interface PendingAdvisorModalProps {
5653
open: boolean;
57-
saboNumbers: number[];
54+
saboNumbers: string[];
5855
onHide: () => void;
5956
}
6057
const PendingAdvisorModal: React.FC<PendingAdvisorModalProps> = ({ open, saboNumbers, onHide }) => {
@@ -74,7 +71,7 @@ const PendingAdvisorModal: React.FC<PendingAdvisorModalProps> = ({ open, saboNum
7471

7572
const toast = useToast();
7673

77-
const onSubmit = async (data: { saboNumbers: number[] }) => {
74+
const onSubmit = async (data: { saboNumbers: string[] }) => {
7875
try {
7976
await sendPendingAdvisorList(data.saboNumbers);
8077
} catch (error: unknown) {

0 commit comments

Comments
 (0)