Remove pending field dependency for TEC (#575)

* Remove pending field dependency for TEC * Remove script * Remove pending field
cornell-dti · Feb 12, 2024 · 3258405 · 3258405
1 parent 2e9ce35
commit 3258405
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 6 deletions.
diff --git a/backend/src/API/teamEventsAPI.ts b/backend/src/API/teamEventsAPI.ts
@@ -113,7 +113,7 @@ export const requestTeamEventCredit = async (
       `User with email ${user.email} cannot request team event credit for another member, ${request.member.email}.`
     );
   }
-  const updatedteamEvent = { ...request, pending: true, status: 'pending' as Status };
+  const updatedteamEvent = { ...request, status: 'pending' as Status };
   const teamEventAttendance = await teamEventAttendanceDao.createTeamEventAttendance(
     updatedteamEvent
   );

diff --git a/backend/src/dao/TeamEventAttendanceDao.ts b/backend/src/dao/TeamEventAttendanceDao.ts
@@ -46,7 +46,6 @@ export default class TeamEventAttendanceDao extends BaseDao<
   ): Promise<TeamEventAttendance> {
     const teamEventAttendanceWithUUID = {
       ...teamEventAttendance,
-      pending: true,
       status: 'pending' as Status,
       uuid: teamEventAttendance.uuid ? teamEventAttendance.uuid : uuidv4()
     };

diff --git a/backend/src/types/DataTypes.d.ts b/backend/src/types/DataTypes.d.ts
@@ -37,7 +37,6 @@ export type DBTeamEventAttendance = {
   hoursAttended?: number;
   image: string;
   eventUuid: string;
-  pending: boolean;
   status: Status;
   reason: string;
   uuid: string;

diff --git a/common-types/index.d.ts b/common-types/index.d.ts
@@ -87,7 +87,6 @@ interface TeamEventAttendance {
   hoursAttended?: number;
   image: string;
   readonly eventUuid: string;
-  readonly pending: boolean;
   readonly status: Status;
   readonly reason: string;
   readonly uuid: string;

diff --git a/frontend/src/components/Admin/TeamEvent/TeamEventCreditReview.tsx b/frontend/src/components/Admin/TeamEvent/TeamEventCreditReview.tsx
@@ -27,7 +27,6 @@ const TeamEventCreditReview = (props: {
   const approveCreditRequest = (teamEventAttendance: TeamEventAttendance) => {
     const updatedTeamEventAttendance = {
       ...teamEventAttendance,
-      pending: false,
       status: 'approved' as Status,
       reason
     };

diff --git a/frontend/src/components/Forms/TeamEventCreditsForm/TeamEventCreditsForm.tsx b/frontend/src/components/Forms/TeamEventCreditsForm/TeamEventCreditsForm.tsx
@@ -75,7 +75,6 @@ const TeamEventCreditForm: React.FC = () => {
         hoursAttended: teamEvent.hasHours ? Number(hours) : undefined,
         image: `eventProofs/${getNetIDFromEmail(userInfo.email)}/${new Date().toISOString()}`,
         eventUuid: teamEvent.uuid,
-        pending: true,
         status: 'pending' as Status,
         reason: '',
         uuid: ''