Adding createGetEmployeePunchLogsRequest
All checks were successful
Deploy FitLien services to Dev / Deploy to Dev (push) Successful in 4m12s
All checks were successful
Deploy FitLien services to Dev / Deploy to Dev (push) Successful in 4m12s
This commit is contained in:
parent
cbe98e8cd0
commit
5e680c3947
@ -13,6 +13,10 @@ export interface EmployeeCodeRequest {
|
|||||||
employeeCode: string;
|
employeeCode: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface PushLogRequest extends EmployeeCodeRequest {
|
||||||
|
attendanceDate: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface UpdateEmployeeExRequest {
|
export interface UpdateEmployeeExRequest {
|
||||||
employeeCode: string;
|
employeeCode: string;
|
||||||
employeeName: string;
|
employeeName: string;
|
||||||
@ -190,6 +194,66 @@ function parseDeleteEmployeeResponse(soapResponse: string): string | null {
|
|||||||
return resultText;
|
return resultText;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function createGetEmployeePunchLogsRequest(username: string, password: string,
|
||||||
|
employeeCode: string, attendanceDate: string): string | null {
|
||||||
|
const soapRequest = `<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<soap12:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://www.w3.org/2003/05/soap-envelope">
|
||||||
|
<soap12:Body>
|
||||||
|
<GetEmployeePunchLogs xmlns="http://tempuri.org/">
|
||||||
|
<UserName>cosqclient</UserName>
|
||||||
|
<Password>3bbb58d5</Password>
|
||||||
|
<EmployeeCode>1</EmployeeCode>
|
||||||
|
<AttendanceDate>2025-05-24</AttendanceDate>
|
||||||
|
</GetEmployeePunchLogs>
|
||||||
|
</soap12:Body>
|
||||||
|
</soap12:Envelope>`;
|
||||||
|
return soapRequest;
|
||||||
|
}
|
||||||
|
|
||||||
|
function createDateFromTime(date: Date, timeString: string): Date {
|
||||||
|
const [hour, minute, second] = timeString.split(':').map(str => parseInt(str, 10));
|
||||||
|
const newDate = new Date(date.getTime());
|
||||||
|
newDate.setHours(hour);
|
||||||
|
newDate.setMinutes(minute);
|
||||||
|
newDate.setSeconds(second);
|
||||||
|
return newDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseGetEmployeePunchLogsResponse(soapResponse: string, attendanceDate: string): Date[] {
|
||||||
|
const rootDate = new Date(attendanceDate);
|
||||||
|
const parser = new DOMParser();
|
||||||
|
const xmlDoc = parser.parseFromString(soapResponse, "text/xml");
|
||||||
|
const currentElement = xmlDoc.documentElement.firstChild as HTMLElement;
|
||||||
|
const resultText = currentElement.textContent;
|
||||||
|
const punchLogs: Date[] = [];
|
||||||
|
const parts = resultText!.split(';');
|
||||||
|
for (const part of parts) {
|
||||||
|
try {
|
||||||
|
const logDateTime = new Date(part);
|
||||||
|
if (isNaN(logDateTime.getTime())) {
|
||||||
|
throw new Error('Invalid date format');
|
||||||
|
}
|
||||||
|
punchLogs.push(logDateTime);
|
||||||
|
} catch {
|
||||||
|
try {
|
||||||
|
const timeParts = part.split(',');
|
||||||
|
for (const timePart of timeParts) {
|
||||||
|
try {
|
||||||
|
const logDateTime = createDateFromTime(rootDate, timePart);
|
||||||
|
punchLogs.push(logDateTime);
|
||||||
|
} catch {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const sortedLogs = punchLogs.sort((a, b) => b.getTime() - a.getTime());
|
||||||
|
return sortedLogs;
|
||||||
|
}
|
||||||
|
|
||||||
async function sendSoapRequest(soapRequest: string, endpoint: string) {
|
async function sendSoapRequest(soapRequest: string, endpoint: string) {
|
||||||
try {
|
try {
|
||||||
const headers: any = {
|
const headers: any = {
|
||||||
@ -215,14 +279,14 @@ async function sendSoapRequest(soapRequest: string, endpoint: string) {
|
|||||||
|
|
||||||
async function getUserDetails(username: string,
|
async function getUserDetails(username: string,
|
||||||
password: string,
|
password: string,
|
||||||
employeeCode: string, endpoint: string) {
|
employeeCode: string, endpoint: string): Promise<DoorAccessUser> {
|
||||||
const soapRequest = createGetEmployeeDetailsRequest(username, password, employeeCode);
|
const soapRequest = createGetEmployeeDetailsRequest(username, password, employeeCode);
|
||||||
const soapResponse = await sendSoapRequest(soapRequest!, endpoint);
|
const soapResponse = await sendSoapRequest(soapRequest!, endpoint);
|
||||||
const parsedResponse = parseGetEmployeeDetailsResponse(soapResponse);
|
const parsedResponse = parseGetEmployeeDetailsResponse(soapResponse);
|
||||||
return parsedResponse;
|
return parsedResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function updateEmployeeEx(username: string,
|
async function updateUserEx(username: string,
|
||||||
password: string,
|
password: string,
|
||||||
request: UpdateEmployeeExRequest,
|
request: UpdateEmployeeExRequest,
|
||||||
endpoint: string) {
|
endpoint: string) {
|
||||||
@ -241,6 +305,16 @@ async function deleteEmplyee(username: string,
|
|||||||
return parsedResponse;
|
return parsedResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function getEmployeePunchLogs(username: string,
|
||||||
|
password: string,
|
||||||
|
employeeCode: string,
|
||||||
|
attendanceDate: string, endpoint: string): Promise<Date[]> {
|
||||||
|
const soapRequest = createGetEmployeePunchLogsRequest(username, password, employeeCode, attendanceDate);
|
||||||
|
const soapResponse = await sendSoapRequest(soapRequest!, endpoint);
|
||||||
|
const parsedResponse = parseGetEmployeePunchLogsResponse(soapResponse, attendanceDate);
|
||||||
|
return parsedResponse;
|
||||||
|
}
|
||||||
|
|
||||||
export const esslGetUserDetails = onRequest({
|
export const esslGetUserDetails = onRequest({
|
||||||
region: '#{SERVICES_RGN}#'
|
region: '#{SERVICES_RGN}#'
|
||||||
}, async (request: Request, response: Response) => {
|
}, async (request: Request, response: Response) => {
|
||||||
@ -339,7 +413,7 @@ export const esslUpdateUser = onRequest({
|
|||||||
if (!updateEmployeeExRequest) {
|
if (!updateEmployeeExRequest) {
|
||||||
throw new Error('Missing request params');
|
throw new Error('Missing request params');
|
||||||
}
|
}
|
||||||
const result = await updateEmployeeEx(username, password, updateEmployeeExRequest, endpoint);
|
const result = await updateUserEx(username, password, updateEmployeeExRequest, endpoint);
|
||||||
response.send(result);
|
response.send(result);
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
logger.error(error);
|
logger.error(error);
|
||||||
@ -398,3 +472,66 @@ export const esslDeleteUser = onRequest({
|
|||||||
response.send(result);
|
response.send(result);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const esslGetEmployeePunchLogs = onRequest({
|
||||||
|
region: '#{SERVICES_RGN}#'
|
||||||
|
}, async (request: Request, response: Response) => {
|
||||||
|
return corsHandler(request, response, async () => {
|
||||||
|
let username: string | null = request.body.username as string;
|
||||||
|
let password: string | null = request.body.password as string;
|
||||||
|
let endpoint: string | null = request.body.endpoint as string;
|
||||||
|
let gymId: string | null = request.body.gymId as string;
|
||||||
|
|
||||||
|
const pushLogRequst = request.body.params as PushLogRequest;
|
||||||
|
|
||||||
|
if (!username) {
|
||||||
|
throw new Error('Missing username or password');
|
||||||
|
}
|
||||||
|
username = username.trim();
|
||||||
|
if (!password) {
|
||||||
|
if (!gymId) {
|
||||||
|
throw new Error('Missing password or gymId');
|
||||||
|
}
|
||||||
|
// todo: Get password from gym configuration by decrypting with private key
|
||||||
|
}
|
||||||
|
password = password.trim();
|
||||||
|
if (!pushLogRequst) {
|
||||||
|
throw new Error('Missing request params');
|
||||||
|
}
|
||||||
|
const employeeCode = pushLogRequst.employeeCode;
|
||||||
|
if (!employeeCode) {
|
||||||
|
throw new Error('Missing employeeCode');
|
||||||
|
}
|
||||||
|
const attendanceDate = pushLogRequst.attendanceDate;
|
||||||
|
if (!attendanceDate) {
|
||||||
|
throw new Error('Missing attendanceDate');
|
||||||
|
}
|
||||||
|
const isValidDate = /^\d{4}-\d{2}-\d{2}$/;
|
||||||
|
if (!attendanceDate.match(isValidDate)) {
|
||||||
|
throw new Error('attendanceDate is not in the valid format YYYY-MM-DD');
|
||||||
|
}
|
||||||
|
if (!endpoint) {
|
||||||
|
throw new Error('Missing endpoint');
|
||||||
|
}
|
||||||
|
if (!endpoint || endpoint.trim() === '') {
|
||||||
|
throw new Error('Missing endpoint');
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
new URL(endpoint);
|
||||||
|
} catch (_) {
|
||||||
|
throw new Error('Endpoint is not a valid URI or URL');
|
||||||
|
}
|
||||||
|
if (!endpoint.endsWith('/webservice.asmx')) {
|
||||||
|
if (endpoint.endsWith('/')) {
|
||||||
|
endpoint = endpoint.substring(0, endpoint.length - 1);
|
||||||
|
}
|
||||||
|
endpoint += '/webservice.asmx';
|
||||||
|
}
|
||||||
|
const result = await getEmployeePunchLogs(username,
|
||||||
|
password,
|
||||||
|
employeeCode,
|
||||||
|
attendanceDate,
|
||||||
|
endpoint);
|
||||||
|
response.send(result);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@ -1 +1,4 @@
|
|||||||
export { esslGetUserDetails, esslUpdateUser, esslDeleteUser } from './essl';
|
export {
|
||||||
|
esslGetUserDetails, esslUpdateUser,
|
||||||
|
esslDeleteUser, esslGetEmployeePunchLogs
|
||||||
|
} from './essl';
|
||||||
@ -17,4 +17,7 @@ export { processNotificationOnCreate } from './notifications';
|
|||||||
export * from './payments';
|
export * from './payments';
|
||||||
export { getPlaceDetails, getPlacesAutocomplete } from './places';
|
export { getPlaceDetails, getPlacesAutocomplete } from './places';
|
||||||
export { registerClient } from './users';
|
export { registerClient } from './users';
|
||||||
export { esslGetUserDetails, esslUpdateUser, esslDeleteUser } from './dooraccess';
|
export {
|
||||||
|
esslGetUserDetails, esslUpdateUser,
|
||||||
|
esslDeleteUser, esslGetEmployeePunchLogs
|
||||||
|
} from './dooraccess';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user