Merge pull request 'patches v1.7.3' (#120) from develop into main

Reviewed-on: #120

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;

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()

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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")
+      .orderBy("user.firstname", "ASC")
-      .addOrderBy("lastname", "ASC")
+      .addOrderBy("user.lastname", "ASC")
       .getMany()
       .then((res) => {
         return res;