From 8c3f83ed00eb2f9b937c0d7c045b3da983ce4f0a Mon Sep 17 00:00:00 2001 From: N08I40K Date: Thu, 20 Mar 2025 04:15:56 +0400 Subject: [PATCH] =?UTF-8?q?fixup!=20=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5=D1=80=D1=82?= =?UTF-8?q?=D0=B5=D1=80=D0=B0=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=B3=D1=80=D1=83?= =?UTF-8?q?=D0=BF=D0=BF=20=D0=B2=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 1 - package.json | 1 - .../internal/schedule-parser/schedule-parser.ts | 11 +++++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19c8b44..65b99da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,6 @@ "firebase-admin": "^13.0.2", "jsdom": "^26.0.0", "jsonwebtoken": "^9.0.2", - "lodash": "^4.17.21", "object-hash": "^3.0.0", "reflect-metadata": "^0.2.2", "rxjs": "^7.8.1", diff --git a/package.json b/package.json index 96e9037..23b8802 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,6 @@ "firebase-admin": "^13.0.2", "jsdom": "^26.0.0", "jsonwebtoken": "^9.0.2", - "lodash": "^4.17.21", "object-hash": "^3.0.0", "reflect-metadata": "^0.2.2", "rxjs": "^7.8.1", diff --git a/src/schedule/internal/schedule-parser/schedule-parser.ts b/src/schedule/internal/schedule-parser/schedule-parser.ts index c699573..2059b99 100644 --- a/src/schedule/internal/schedule-parser/schedule-parser.ts +++ b/src/schedule/internal/schedule-parser/schedule-parser.ts @@ -4,7 +4,6 @@ import * as XLSX from "xlsx"; import { Range, WorkSheet } from "xlsx"; import { toNormalString, trimAll } from "../../../utility/string.util"; import { plainToInstance, Type } from "class-transformer"; -import * as objectHash from "object-hash"; import LessonTime from "../../entities/lesson-time.entity"; import { LessonType } from "../../enum/lesson-type.enum"; import LessonSubGroup from "../../entities/lesson-sub-group.entity"; @@ -24,7 +23,8 @@ import { } from "class-validator"; import { ClassProperties } from "../../../utility/class-trasformer/class-transformer-ctor"; import { ToMap } from "create-map-transform-fn"; -import cloneDeep from "lodash/cloneDeep"; + +import * as objectHash from "object-hash"; type InternalId = { /** @@ -369,7 +369,7 @@ export class ScheduleParser { }); })(); - const cloneDays = () => cloneDeep(days); + const cloneDays = () => structuredClone(days); for (const group of groups.values()) { group.days.forEach((day, dayIndex) => { @@ -391,7 +391,10 @@ export class ScheduleParser { dayIndex ]; - const lesson = cloneDeep(groupLesson) as TeacherLesson; + const lesson = structuredClone( + groupLesson, + ) as TeacherLesson; + lesson.group = group.name; teacherDay.lessons.push(lesson);