Skip to content

Commit f47848a

Browse files
refactor: enhance type handling in acknowledgeOooRequest
- Updated requestData type assertion to include oldOooStatusRequest for better type safety. - Removed legacy request format normalization logic to streamline the function and improve clarity.
1 parent b2fb635 commit f47848a

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

services/oooRequest.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,18 +147,12 @@ export const acknowledgeOooRequest = async (
147147
superUserId: string,
148148
) => {
149149
try{
150-
const requestData = await getRequests({ id: requestId });
150+
const requestData = await getRequests({ id: requestId }) as OooStatusRequest | oldOooStatusRequest;
151151
if (!requestData) {
152152
throw new NotFound("Request not found");
153153
}
154-
//TODO: Remove this after old request format is removed
155-
const normalized: OooStatusRequest = (
156-
(requestData as OooStatusRequest).type === REQUEST_TYPE.OOO &&
157-
'state' in (requestData as OooStatusRequest) &&
158-
!('status' in (requestData as OooStatusRequest))
159-
) ? newOOOSchema(requestData as oldOooStatusRequest) as OooStatusRequest : requestData as OooStatusRequest;
154+
const { type, status, from, until, requestedBy } = requestData as OooStatusRequest;
160155

161-
const { type, status, from, until, requestedBy } = normalized;
162156
await validateOooAcknowledgeRequest(type as string, status as string);
163157
const requestResult = await updateRequest(requestId, body, superUserId, REQUEST_TYPE.OOO);
164158
if(requestResult.error){

0 commit comments

Comments
 (0)