Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 85 additions & 2 deletions guard_app/src/api/availability.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */

// src/api/availability.ts
import http from '../lib/http';

// Existing types (keep for backward compatibility)
export interface AvailabilityData {
userId: string;
days: string[];
Expand All @@ -15,6 +15,47 @@
};
}

// New types for calendar-based availability
export type AvailabilitySlotDto = {
_id: string;
guardId: string;
date: string; // "2025-12-25" ISO date format
fromTime: string; // "09:00"
toTime: string; // "17:00"
recurring?: {
enabled: boolean;
pattern: 'weekly' | 'daily';
endDate?: string;
};
createdAt: string;
updatedAt?: string;
};

type AvailabilitySlotListResponse =
| AvailabilitySlotDto[]
| { items?: AvailabilitySlotDto[] }
| { data?: AvailabilitySlotDto[] }
| { availability?: AvailabilitySlotDto[] };

type AvailabilitySlotResponse = {
message?: string;
availability?: AvailabilitySlotDto;
data?: AvailabilitySlotDto;
};

// Utility to normalize array responses (same pattern as shifts.ts)
function toArray<T>(payload: AvailabilitySlotListResponse | any): T[] {

Check warning on line 47 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 47 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type
if (Array.isArray(payload)) return payload;
if (Array.isArray((payload as any)?.items)) return (payload as any).items;

Check warning on line 49 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 49 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 49 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 49 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type
if (Array.isArray((payload as any)?.data)) return (payload as any).data;

Check warning on line 50 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 50 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 50 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 50 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type
if (Array.isArray((payload as any)?.availability)) return (payload as any).availability;

Check warning on line 51 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 51 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 51 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 51 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type
return [];
}

// ============================================================================
// EXISTING ENDPOINTS (keep for backward compatibility)
// ============================================================================

// GET /api/v1/availability/:userId
export const getAvailability = async (userId: string): Promise<AvailabilityData | null> => {
try {
Expand All @@ -30,7 +71,7 @@
typeof err === 'object' &&
err !== null &&
'response' in err &&
(err as any).response?.status === 404

Check warning on line 74 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type

Check warning on line 74 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Unexpected any. Specify a different type
) {
return null;
}
Expand All @@ -45,3 +86,45 @@
const res = await http.post<AvailabilityResponse>('/availability', payload);
return res.data;
};

// ============================================================================
// NEW ENDPOINTS (for calendar-based availability management)
// ============================================================================

// POST /api/v1/availability/slots
export async function addAvailabilitySlot(params: {
date: string;
fromTime: string;
toTime: string;
recurring?: {
enabled: boolean;
pattern: 'weekly' | 'daily';
endDate?: string;
};
}) {
const { data } = await http.post<AvailabilitySlotResponse>('/availability/slots', params);
return data.availability || data.data || data;
}

// GET /api/v1/availability/slots/my-slots
export async function getMyAvailabilitySlots(params?: {

Check failure on line 110 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Replace `⏎··startDate?:·string;⏎··endDate?:·string;⏎` with `·startDate?:·string;·endDate?:·string·`

Check failure on line 110 in guard_app/src/api/availability.ts

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

Replace `⏎··startDate?:·string;⏎··endDate?:·string;⏎` with `·startDate?:·string;·endDate?:·string·`
startDate?: string;
endDate?: string;
}) {
const { data } = await http.get<AvailabilitySlotListResponse>('/availability/slots/my-slots', {
params,
});
return toArray<AvailabilitySlotDto>(data);
}

// DELETE /api/v1/availability/slots/:id
export async function removeAvailabilitySlot(id: string) {
const { data } = await http.delete(`/availability/slots/${id}`);
return data;
}

// DELETE /api/v1/availability/slots/clear-all
export async function clearAllAvailabilitySlots() {
const { data } = await http.delete('/availability/slots/clear-all');
return data;
}
2 changes: 0 additions & 2 deletions guard_app/src/navigation/AppNavigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import ShiftDetailsScreen from '../screen/ShiftDetailsScreen';
import SignupScreen from '../screen/signupscreen';
import SplashScreen from '../screen/SplashScreen';
import DocumentsScreen from '../screen/DocumentsScreen';

export type RootStackParamList = {
AppTabs: undefined;
Splash: undefined;
Expand Down Expand Up @@ -60,9 +58,9 @@
name="Certificates"
component={CertificatesScreen}
options={{ headerShown: true, title: 'Certificates' }}
name="ShiftDetails"

Check failure on line 61 in guard_app/src/navigation/AppNavigator.tsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

No duplicate props allowed

Check failure on line 61 in guard_app/src/navigation/AppNavigator.tsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

No duplicate props allowed
component={ShiftDetailsScreen}

Check failure on line 62 in guard_app/src/navigation/AppNavigator.tsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

No duplicate props allowed

Check failure on line 62 in guard_app/src/navigation/AppNavigator.tsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

No duplicate props allowed
options={{ headerShown: true, title: 'Shift Details' }}

Check failure on line 63 in guard_app/src/navigation/AppNavigator.tsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

No duplicate props allowed

Check failure on line 63 in guard_app/src/navigation/AppNavigator.tsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier

No duplicate props allowed
/>
</Stack.Navigator>
);
Expand Down
Loading
Loading