From cc0a263325edd594961ed1c4ef0114ef8fbbf252 Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Mon, 14 Jul 2025 14:28:48 +0200 Subject: [PATCH] fix: more specific columns for sort --- src/service/club/calendarService.ts | 2 +- src/service/club/newsletter/newsletterService.ts | 2 +- src/service/club/protocol/protocolService.ts | 2 +- src/service/configuration/awardService.ts | 2 +- src/service/configuration/calendarTypeService.ts | 2 +- src/service/configuration/communicationTypeService.ts | 2 +- src/service/configuration/education.ts | 2 +- src/service/configuration/executivePositionService.ts | 2 +- src/service/configuration/membershipStatusService.ts | 2 +- src/service/configuration/qualification.ts | 2 +- src/service/configuration/queryStoreService.ts | 2 +- src/service/configuration/salutationService.ts | 2 +- src/service/configuration/templateService.ts | 2 +- src/service/configuration/templateUsageService.ts | 2 +- src/service/management/roleService.ts | 2 +- src/service/management/userService.ts | 4 ++-- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/service/club/calendarService.ts b/src/service/club/calendarService.ts index 7e8f86b..c6c7128 100644 --- a/src/service/club/calendarService.ts +++ b/src/service/club/calendarService.ts @@ -13,7 +13,7 @@ export default abstract class CalendarService { .getRepository(calendar) .createQueryBuilder("calendar") .leftJoinAndSelect("calendar.type", "type") - .orderBy("starttime", "ASC") + .orderBy("calendar.starttime", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/club/newsletter/newsletterService.ts b/src/service/club/newsletter/newsletterService.ts index b11bfd7..d2401b3 100644 --- a/src/service/club/newsletter/newsletterService.ts +++ b/src/service/club/newsletter/newsletterService.ts @@ -12,7 +12,7 @@ export default abstract class NewsletterService { return await dataSource .getRepository(newsletter) .createQueryBuilder("newsletter") - .orderBy("createdAt", "DESC") + .orderBy("newsletter.createdAt", "DESC") .offset(offset) .limit(count) .getManyAndCount() diff --git a/src/service/club/protocol/protocolService.ts b/src/service/club/protocol/protocolService.ts index 185d76a..a8c5828 100644 --- a/src/service/club/protocol/protocolService.ts +++ b/src/service/club/protocol/protocolService.ts @@ -14,7 +14,7 @@ export default abstract class ProtocolService { .createQueryBuilder("protocol") .offset(offset) .limit(count) - .orderBy("date", "DESC") + .orderBy("protocol.date", "DESC") .getManyAndCount() .then((res) => { return res; diff --git a/src/service/configuration/awardService.ts b/src/service/configuration/awardService.ts index 223d676..f7a0b66 100644 --- a/src/service/configuration/awardService.ts +++ b/src/service/configuration/awardService.ts @@ -13,7 +13,7 @@ export default abstract class AwardService { return await dataSource .getRepository(award) .createQueryBuilder("award") - .orderBy("award", "ASC") + .orderBy("award.award", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/configuration/calendarTypeService.ts b/src/service/configuration/calendarTypeService.ts index 7d82ef4..a84e5a9 100644 --- a/src/service/configuration/calendarTypeService.ts +++ b/src/service/configuration/calendarTypeService.ts @@ -12,7 +12,7 @@ export default abstract class CalendarTypeService { return await dataSource .getRepository(calendarType) .createQueryBuilder("calendarType") - .orderBy("type", "ASC") + .orderBy("calendarType.type", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/configuration/communicationTypeService.ts b/src/service/configuration/communicationTypeService.ts index 4ee9de0..44fef7f 100644 --- a/src/service/configuration/communicationTypeService.ts +++ b/src/service/configuration/communicationTypeService.ts @@ -12,7 +12,7 @@ export default abstract class CommunicationTypeService { return await dataSource .getRepository(communicationType) .createQueryBuilder("communicationType") - .orderBy("type", "ASC") + .orderBy("communicationType.type", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/configuration/education.ts b/src/service/configuration/education.ts index b621db3..13a2e52 100644 --- a/src/service/configuration/education.ts +++ b/src/service/configuration/education.ts @@ -11,7 +11,7 @@ export default abstract class EducationService { return await dataSource .getRepository(education) .createQueryBuilder("education") - .orderBy("education", "ASC") + .orderBy("education.education", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/configuration/executivePositionService.ts b/src/service/configuration/executivePositionService.ts index 6a2bf8d..542093e 100644 --- a/src/service/configuration/executivePositionService.ts +++ b/src/service/configuration/executivePositionService.ts @@ -13,7 +13,7 @@ export default abstract class ExecutivePositionService { return await dataSource .getRepository(executivePosition) .createQueryBuilder("executivePosition") - .orderBy("position", "ASC") + .orderBy("executivePosition.position", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/configuration/membershipStatusService.ts b/src/service/configuration/membershipStatusService.ts index ade5a53..d8b5ded 100644 --- a/src/service/configuration/membershipStatusService.ts +++ b/src/service/configuration/membershipStatusService.ts @@ -13,7 +13,7 @@ export default abstract class MembershipStatusService { return await dataSource .getRepository(membershipStatus) .createQueryBuilder("membershipStatus") - .orderBy("status", "ASC") + .orderBy("membershipStatus.status", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/configuration/qualification.ts b/src/service/configuration/qualification.ts index 137bda2..367fe6a 100644 --- a/src/service/configuration/qualification.ts +++ b/src/service/configuration/qualification.ts @@ -14,7 +14,7 @@ export default abstract class QualificationService { return await dataSource .getRepository(qualification) .createQueryBuilder("qualification") - .orderBy("qualification", "ASC") + .orderBy("qualification.qualification", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/configuration/queryStoreService.ts b/src/service/configuration/queryStoreService.ts index ecce9cc..c2e969f 100644 --- a/src/service/configuration/queryStoreService.ts +++ b/src/service/configuration/queryStoreService.ts @@ -12,7 +12,7 @@ export default abstract class QueryStoreService { return await dataSource .getRepository(query) .createQueryBuilder("queryStore") - .orderBy("title", "ASC") + .orderBy("queryStore.title", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/configuration/salutationService.ts b/src/service/configuration/salutationService.ts index f8a020e..0e97cc1 100644 --- a/src/service/configuration/salutationService.ts +++ b/src/service/configuration/salutationService.ts @@ -12,7 +12,7 @@ export default abstract class SalutationService { return await dataSource .getRepository(salutation) .createQueryBuilder("salutation") - .orderBy("salutation", "ASC") + .orderBy("salutation.salutation", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/configuration/templateService.ts b/src/service/configuration/templateService.ts index dd3e008..fcc2eb6 100644 --- a/src/service/configuration/templateService.ts +++ b/src/service/configuration/templateService.ts @@ -13,7 +13,7 @@ export default abstract class TemplateService { return await dataSource .getRepository(template) .createQueryBuilder("template") - .orderBy("template", "ASC") + .orderBy("template.template", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/configuration/templateUsageService.ts b/src/service/configuration/templateUsageService.ts index ce6b508..99fe2dc 100644 --- a/src/service/configuration/templateUsageService.ts +++ b/src/service/configuration/templateUsageService.ts @@ -15,7 +15,7 @@ export default abstract class TemplateUsageService { .leftJoinAndSelect("templateUsage.header", "headerTemplate") .leftJoinAndSelect("templateUsage.body", "bodyTemplate") .leftJoinAndSelect("templateUsage.footer", "footerTemplate") - .orderBy("scope", "ASC") + .orderBy("templateUsage.scope", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/management/roleService.ts b/src/service/management/roleService.ts index c3a2dcd..4aa761b 100644 --- a/src/service/management/roleService.ts +++ b/src/service/management/roleService.ts @@ -13,7 +13,7 @@ export default abstract class RoleService { .getRepository(role) .createQueryBuilder("role") .leftJoinAndSelect("role.permissions", "role_permissions") - .orderBy("role", "ASC") + .orderBy("role.role", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/management/userService.ts b/src/service/management/userService.ts index d273315..dd877ee 100644 --- a/src/service/management/userService.ts +++ b/src/service/management/userService.ts @@ -16,8 +16,8 @@ export default abstract class UserService { .leftJoinAndSelect("user.roles", "roles") .leftJoinAndSelect("user.permissions", "permissions") .leftJoinAndSelect("roles.permissions", "role_permissions") - .orderBy("firstname", "ASC") - .addOrderBy("lastname", "ASC") + .orderBy("user.firstname", "ASC") + .addOrderBy("user.lastname", "ASC") .getMany() .then((res) => { return res;