N21-2095 clean code

hpi-schul-cloud · Jul 23, 2024 · af1cd19 · af1cd19
1 parent 43b6a25
commit af1cd19
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/apps/server/src/modules/group/uc/class-group.uc.ts b/apps/server/src/modules/group/uc/class-group.uc.ts
@@ -187,11 +187,11 @@ export class ClassGroupUc {
 
 		switch (schoolYearQueryType) {
 			case SchoolYearQueryType.CURRENT_YEAR:
-				return schoolYear.startDate === currentYear.getProps().startDate;
+				return schoolYear.startDate === currentYear.startDate;
 			case SchoolYearQueryType.NEXT_YEAR:
-				return schoolYear.startDate > currentYear.getProps().startDate;
+				return schoolYear.startDate > currentYear.startDate;
 			case SchoolYearQueryType.PREVIOUS_YEARS:
-				return schoolYear.startDate < currentYear.getProps().startDate;
+				return schoolYear.startDate < currentYear.startDate;
 			default:
 				throw new UnknownQueryTypeLoggableException(schoolYearQueryType);
 		}

diff --git a/apps/server/src/modules/school/domain/do/school-year.ts b/apps/server/src/modules/school/domain/do/school-year.ts
@@ -1,6 +1,10 @@
 import { AuthorizableObject, DomainObject } from '@shared/domain/domain-object';
 
-export class SchoolYear extends DomainObject<SchoolYearProps> {}
+export class SchoolYear extends DomainObject<SchoolYearProps> {
+	get startDate() {
+		return this.props.startDate;
+	}
+}
 
 export interface SchoolYearProps extends AuthorizableObject {
 	name: string;

diff --git a/apps/server/src/modules/school/domain/do/school.ts b/apps/server/src/modules/school/domain/do/school.ts
@@ -20,6 +20,10 @@ interface SchoolInfo {
 }
 
 export class School extends DomainObject<SchoolProps> {
+	get currentYear() {
+		return this.props.currentYear;
+	}
+
 	get systems(): EntityId[] {
 		return this.props.systemIds;
 	}

diff --git a/apps/server/src/modules/school/domain/service/school.service.ts b/apps/server/src/modules/school/domain/service/school.service.ts
@@ -55,7 +55,7 @@ export class SchoolService {
 
 	public async getCurrentYear(schoolId: EntityId) {
 		const school = await this.getSchoolById(schoolId);
-		return school.getProps().currentYear;
+		return school.currentYear;
 	}
 
 	public async doesSchoolExist(schoolId: EntityId): Promise<boolean> {