Merge pull request #98 from Shubham4026/shishka_main_testing

Task #216811: Created Adapter of Attendance, Cohort,field

src/adapters/attendanceservicelocator.ts

@@ -3,8 +3,15 @@ import { AttendanceSearchDto } from "src/attendance/dto/attendance-search.dto";
 import { AttendanceDto } from "src/attendance/dto/attendance.dto";
 
 export interface IServicelocator {
-  checkAndAddAttendance(request: Request, attendanceDto: AttendanceDto): unknown;
-  getAttendance(tenantId: string, attendanceId: string, request: any);
+  // checkAndAddAttendance(request: Request, attendanceDto: AttendanceDto): unknown;
+  // getAttendance(tenantId: string, attendanceId: string, request: any);
+  attendanceReport(
+    attendanceStatsDto
+  );
+  updateAttendanceRecord(
+    request,
+    attendanceDto
+  );
   updateAttendance(
     attendanceId: string,
     request: any,
@@ -14,7 +21,7 @@ export interface IServicelocator {
   multipleAttendance(
     tenantId: string,
     request: any,
-    attendanceData: [AttendanceDto]
+    attendanceData: any
   );
   searchAttendance(
     tenantId: string,

src/adapters/cohortservicelocator.ts

@@ -4,7 +4,13 @@ import { CohortDto } from "src/cohort/dto/cohort.dto";
 
 export interface IServicelocatorcohort {
   createCohort(request: any, cohortDto: CohortCreateDto);
-  getCohort(tenantId, cohortId, request, res);
+  // getCohort(tenantId, cohortId, request, res);
   searchCohort(tenantid, request: any, cohortSearchDto: CohortSearchDto, res);
   updateCohort(cohortId: string, request: any, cohortDto: CohortCreateDto);
+  getCohortList(
+    tenantid,
+    id,
+    request,
+    response
+  );
 }

src/adapters/fieldsservicelocator.ts

@@ -6,12 +6,12 @@ import { FieldValuesSearchDto } from "src/fields/dto/field-values-search.dto";
 export interface IServicelocatorfields {
   //fields
   createFields(request: any, fieldsDto: FieldsDto);
-  getFields(tenantId, fieldsId, request);
+  // getFields(tenantId, fieldsId, request);
   searchFields(tenantid, request: any, fieldsSearchDto: FieldsSearchDto);
-  updateFields(fieldsId: string, request: any, fieldsDto: FieldsDto);
+  // updateFields(fieldsId: string, request: any, fieldsDto: FieldsDto);
   //field values
   createFieldValues(request: any, fieldValuesDto: FieldValuesDto);
-  getFieldValues(id, request);
+  // getFieldValues(id, request);
   searchFieldValues(request: any, fieldValuesSearchDto: FieldValuesSearchDto);
   updateFieldValues(id: string, request: any, fieldValuesDto: FieldValuesDto);
 }

src/adapters/hasura/attendance.adapter.ts

@@ -18,7 +18,12 @@ export class AttendanceHasuraService implements IServicelocator {
   axios = require("axios");
 
   constructor(private httpService: HttpService) {}
-
+  public async attendanceReport(attendanceStatsDto: any) {
+
+  }
+  public async updateAttendanceRecord(request: any, attendanceDto: any) {
+
+  }
   public async getAttendance(
     tenantId: string,
     attendanceId: string,

src/adapters/hasura/cohort.adapter.ts

@@ -22,6 +22,8 @@ export class HasuraCohortService implements IServicelocatorcohort {
     private httpService: HttpService,
     private fieldsService: FieldsService
   ) {}
+  public async  getCohortList(tenantid: any, id: any, request: any, response: any) {
+  }
 
   public async createCohort(request: any, cohortCreateDto: CohortCreateDto) {
     try{

src/attendance/attendance.service.ts → src/adapters/postgres/attendance-adapter.ts

@@ -1,24 +1,24 @@
-import { User } from './../user/entities/user-entity';
+import { User } from '../../user/entities/user-entity';
 import { isAfter } from 'date-fns';
 import { ConfigService } from '@nestjs/config';
 import { Client } from 'pg';
 import jwt_decode from "jwt-decode";
 import { InjectRepository } from "@nestjs/typeorm";
-import { AttendanceEntity } from "./entities/attendance.entity";
+import { AttendanceEntity } from "../../attendance/entities/attendance.entity";
 import { Repository } from "typeorm";
 import { BadRequestException, HttpException, HttpStatus, Injectable } from "@nestjs/common";
-import { AttendanceSearchDto } from "./dto/attendance-search.dto";
+import { AttendanceSearchDto } from "../../attendance/dto/attendance-search.dto";
 import { SuccessResponse } from 'src/success-response';
-import { AttendanceDto, BulkAttendanceDTO } from './dto/attendance.dto';
-import { AttendanceDateDto } from './dto/attendance-date.dto';
+import { AttendanceDto, BulkAttendanceDTO } from '../../attendance/dto/attendance.dto';
+import { AttendanceDateDto } from '../../attendance/dto/attendance-date.dto';
 import { Between } from 'typeorm';
-import { AttendanceStatsDto } from './dto/attendance-stats.dto';
+import { AttendanceStatsDto } from '../../attendance/dto/attendance-stats.dto';
 import { format } from 'date-fns'
 import { ErrorResponseTypeOrm } from 'src/error-response-typeorm';
 const moment = require('moment');
 
 @Injectable()
-export class AttendanceService {
+export class PostgresAttendanceService {
     constructor(private configService: ConfigService,
         @InjectRepository(AttendanceEntity)
         private readonly attendanceRepository: Repository<AttendanceEntity>,