fix bugs

RealVlad322 · Sep 1, 2024 · 92362fc · 92362fc
1 parent 351144a
commit 92362fc
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 9 deletions.
diff --git a/src/apps/shedule/shedule.service.ts b/src/apps/shedule/shedule.service.ts
@@ -20,12 +20,19 @@ export class SheduleService {
 
   async getShedules(query: SheduleGetListDto): Promise<Shedule[]> {
     const { grade, groupName, group, startTimeStamp, endTimeStamp, sortByDate, teacher } = query;
-    const searchQuery: any = { // TODO: remove any
+    const searchQuery: any = {
+      // TODO: remove any
       date: { $gte: startTimeStamp, $lte: endTimeStamp },
-      grade,
-      group,
     };
 
+    if (grade) {
+      searchQuery.grade = grade;
+    }
+
+    if (group) {
+      searchQuery.group = group;
+    }
+
     if (groupName) {
       searchQuery.groupName = groupName;
     }
@@ -46,7 +53,12 @@ export class SheduleService {
     try {
       await this.sheduleModel
         .findOneAndUpdate(
-          { groupName: data.groupName, grade: data.grade, group: data.group, date: data.date },
+          {
+            groupName: data.groupName,
+            grade: data.grade,
+            date: data.date,
+            teacher: data.teacher,
+          },
           data,
           { upsert: true },
         )

diff --git a/src/shared/contract/mapper/mstuca-shedule-mapper.service.ts b/src/shared/contract/mapper/mstuca-shedule-mapper.service.ts
@@ -10,7 +10,7 @@ export class MstucaSheduleMapperService {
     fullStat.forEach((sub) => {
       const shedule: CreateSheduleDto = {
         date: sub.date,
-        grade: 4,
+        grade: 0,
         group: 1,
         discipline: '',
         faculty: '',
@@ -19,16 +19,25 @@ export class MstucaSheduleMapperService {
         type: '',
         place: '',
         teacher: '',
+        syncedAt: new Date().toISOString(),
       };
       shedule.discipline = sub.discipline;
       shedule.type = sub.kindOfWork;
       shedule.place = sub.auditorium;
-      shedule.index = sub.lessonNumberStart;
       shedule.teacher = sub.lecturer;
       shedule.address = sub.building;
       shedule.groupName = sub.stream;
+      shedule.grade = sub.stream_facultyoid;
+      shedule.subgroup = sub.subGroup;
 
-      result.push({ ...sub, ...shedule });
+      if (sub.duration > 2) {
+        shedule.index = sub.lessonNumberStart;
+        result.push({ ...shedule });
+      }
+
+      shedule.index = sub.lessonNumberEnd;
+
+      result.push({ ...shedule });
     });
 
     return result;

diff --git a/src/shared/contract/mstuca-api/types.ts b/src/shared/contract/mstuca-api/types.ts
@@ -11,4 +11,8 @@ export interface MstucaResponse {
   lessonNumberStart: number;
   stream_facultyoid: number;
   stream: string;
+  subGroup: string | number | null;
+  subGroupOid: number | null;
+  subgroup_facultyoid: number | null;
+  duration: number;
 }
diff --git a/src/shared/outs/shedule.out.ts b/src/shared/outs/shedule.out.ts
@@ -15,7 +15,7 @@ export class SheduleOut {
 
   @IsOptional()
   @IsNumber()
-  declare subgroup?: number;
+  declare subgroup?: number | string | null;
 
   @IsString()
   declare date: string;
@@ -42,4 +42,7 @@ export class SheduleOut {
   @IsOptional()
   @IsString()
   declare address?: string;
+
+  @IsString()
+  declare syncedAt: string;
 }
diff --git a/src/shared/schemas/shedule.schema.ts b/src/shared/schemas/shedule.schema.ts
@@ -18,7 +18,7 @@ export class Shedule {
   declare group: number;
 
   @Prop()
-  declare subgroup: number;
+  declare subgroup: number | string | null;
 
   @Prop({ required: true })
   declare date: string;
@@ -43,6 +43,9 @@ export class Shedule {
 
   @Prop()
   declare address: string;
+
+  @Prop()
+  declare syncedAt: string;
 }
 
 export const SheduleSchema = SchemaFactory.createForClass(Shedule);