folder structure

src/command/club/calendar/calendarCommandHandler.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { calendar } from "../entity/calendar";
-import { calendarType } from "../entity/calendarType";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { calendar } from "../../../entity/club/calendar";
+import { calendarType } from "../../../entity/settings/calendarType";
+import InternalException from "../../../exceptions/internalException";
 import { CreateCalendarCommand, DeleteCalendarCommand, UpdateCalendarCommand } from "./calendarCommand";
 
 export default abstract class CalendarCommandHandler {

src/command/club/member/communicationCommandHandler.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { communication } from "../entity/communication";
-import { communicationType } from "../entity/communicationType";
-import { user } from "../entity/user";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { communication } from "../../../entity/club/member/communication";
+import { communicationType } from "../../../entity/settings/communicationType";
+import { user } from "../../../entity/user/user";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateCommunicationCommand,
   DeleteCommunicationCommand,

src/command/club/member/memberAwardCommandHandler.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { award } from "../entity/award";
-import { member } from "../entity/member";
-import { memberAwards } from "../entity/memberAwards";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { award } from "../../../entity/settings/award";
+import { member } from "../../../entity/club/member/member";
+import { memberAwards } from "../../../entity/club/member/memberAwards";
+import InternalException from "../../../exceptions/internalException";
 import { CreateMemberAwardCommand, DeleteMemberAwardCommand, UpdateMemberAwardCommand } from "./memberAwardCommand";
 
 export default abstract class MemberAwardCommandHandler {

src/command/club/member/memberCommand.ts

@@ -1,4 +1,4 @@
-import { Salutation } from "../enums/salutation";
+import { Salutation } from "../../../enums/salutation";
 
 export interface CreateMemberCommand {
   salutation: Salutation;

src/command/club/member/memberCommandHandler.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { communication } from "../entity/communication";
-import { member } from "../entity/member";
-import InternalException from "../exceptions/internalException";
-import CommunicationService from "../service/communicationService";
+import { dataSource } from "../../../data-source";
+import { communication } from "../../../entity/club/member/communication";
+import { member } from "../../../entity/club/member/member";
+import InternalException from "../../../exceptions/internalException";
+import CommunicationService from "../../../service/club/member/communicationService";
 import {
   CreateMemberCommand,
   DeleteMemberCommand,

src/command/club/member/memberExecutivePositionCommandHandler.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { executivePosition } from "../entity/executivePosition";
-import { member } from "../entity/member";
-import { memberExecutivePositions } from "../entity/memberExecutivePositions";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { executivePosition } from "../../../entity/settings/executivePosition";
+import { member } from "../../../entity/club/member/member";
+import { memberExecutivePositions } from "../../../entity/club/member/memberExecutivePositions";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateMemberExecutivePositionCommand,
   DeleteMemberExecutivePositionCommand,

src/command/club/member/memberQualificationCommandHandler.ts

@@ -1,13 +1,13 @@
-import { dataSource } from "../data-source";
-import { qualification } from "../entity/qualification";
-import { memberQualifications } from "../entity/memberQualifications";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { qualification } from "../../../entity/settings/qualification";
+import { memberQualifications } from "../../../entity/club/member/memberQualifications";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateMemberQualificationCommand,
   DeleteMemberQualificationCommand,
   UpdateMemberQualificationCommand,
 } from "./memberQualificationCommand";
-import { member } from "../entity/member";
+import { member } from "../../../entity/club/member/member";
 
 export default abstract class MemberQualificationCommandHandler {
   /**

src/command/club/member/membershipCommandHandler.ts

@@ -1,8 +1,8 @@
-import { dataSource } from "../data-source";
-import { member } from "../entity/member";
-import { membership } from "../entity/membership";
-import { membershipStatus } from "../entity/membershipStatus";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { member } from "../../../entity/club/member/member";
+import { membership } from "../../../entity/club/member/membership";
+import { membershipStatus } from "../../../entity/settings/membershipStatus";
+import InternalException from "../../../exceptions/internalException";
 import { CreateMembershipCommand, DeleteMembershipCommand, UpdateMembershipCommand } from "./membershipCommand";
 
 export default abstract class MembershipCommandHandler {

src/command/club/newsletter/newsletterCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { newsletter } from "../entity/newsletter";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { newsletter } from "../../../entity/club/newsletter/newsletter";
+import InternalException from "../../../exceptions/internalException";
 import { CreateNewsletterCommand, SendNewsletterCommand, SynchronizeNewsletterCommand } from "./newsletterCommand";
 
 export default abstract class NewsletterCommandHandler {

src/command/club/newsletter/newsletterDatesCommandHandler.ts

@@ -1,9 +1,9 @@
 import { DeleteResult, EntityManager, InsertResult, UpdateResult } from "typeorm";
-import { dataSource } from "../data-source";
-import InternalException from "../exceptions/internalException";
-import NewsletterDatesService from "../service/newsletterDatesService";
+import { dataSource } from "../../../data-source";
+import InternalException from "../../../exceptions/internalException";
+import NewsletterDatesService from "../../../service/club/newsletter/newsletterDatesService";
 import { NewsletterDateCommand, SynchronizeNewsletterDatesCommand } from "./newsletterDatesCommand";
-import { newsletterDates } from "../entity/newsletterDates";
+import { newsletterDates } from "../../../entity/club/newsletter/newsletterDates";
 
 export default abstract class NewsletterDatesCommandHandler {
   /**

src/command/club/newsletter/newsletterRecipientsCommandHandler.ts

@@ -1,9 +1,9 @@
 import { DeleteResult, EntityManager, InsertResult, UpdateResult } from "typeorm";
-import { dataSource } from "../data-source";
-import InternalException from "../exceptions/internalException";
-import NewsletterRecipientsService from "../service/newsletterRecipientsService";
+import { dataSource } from "../../../data-source";
+import InternalException from "../../../exceptions/internalException";
+import NewsletterRecipientsService from "../../../service/club/newsletter/newsletterRecipientsService";
 import { SynchronizeNewsletterRecipientsCommand } from "./newsletterRecipientsCommand";
-import { newsletterRecipients } from "../entity/newsletterRecipients";
+import { newsletterRecipients } from "../../../entity/club/newsletter/newsletterRecipients";
 
 export default abstract class NewsletterRecipientsCommandHandler {
   /**

src/command/club/protocol/protocolAgendaCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocolAgenda } from "../entity/protocolAgenda";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocolAgenda } from "../../../entity/club/protocol/protocolAgenda";
+import InternalException from "../../../exceptions/internalException";
 import { SynchronizeProtocolAgendaCommand } from "./protocolAgendaCommand";
 
 export default abstract class ProtocolAgendaCommandHandler {

src/command/club/protocol/protocolCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocol } from "../entity/protocol";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocol } from "../../../entity/club/protocol/protocol";
+import InternalException from "../../../exceptions/internalException";
 import { CreateProtocolCommand, SynchronizeProtocolCommand } from "./protocolCommand";
 
 export default abstract class ProtocolCommandHandler {

src/command/club/protocol/protocolDecisionCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocolDecision } from "../entity/protocolDecision";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocolDecision } from "../../../entity/club/protocol/protocolDecision";
+import InternalException from "../../../exceptions/internalException";
 import { SynchronizeProtocolDecisionCommand } from "./protocolDecisionCommand";
 
 export default abstract class ProtocolDecisionCommandHandler {

src/command/club/protocol/protocolPresenceCommandHandler.ts

@@ -1,8 +1,8 @@
 import { DeleteResult, EntityManager, InsertResult, UpdateResult } from "typeorm";
-import { dataSource } from "../data-source";
-import { protocolPresence } from "../entity/protocolPresence";
-import InternalException from "../exceptions/internalException";
-import ProtocolPresenceService from "../service/protocolPrecenseService";
+import { dataSource } from "../../../data-source";
+import { protocolPresence } from "../../../entity/club/protocol/protocolPresence";
+import InternalException from "../../../exceptions/internalException";
+import ProtocolPresenceService from "../../../service/club/protocol/protocolPrecenseService";
 import { ProtocolPresenceCommand, SynchronizeProtocolPresenceCommand } from "./protocolPresenceCommand";
 
 export default abstract class ProtocolPresenceCommandHandler {

src/command/club/protocol/protocolPrintoutCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocolPrintout } from "../entity/protocolPrintout";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocolPrintout } from "../../../entity/club/protocol/protocolPrintout";
+import InternalException from "../../../exceptions/internalException";
 import { CreateProtocolPrintoutCommand } from "./protocolPrintoutCommand";
 
 export default abstract class ProtocolPrintoutCommandHandler {

src/command/club/protocol/protocolVotingCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { protocolVoting } from "../entity/protocolVoting";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { protocolVoting } from "../../../entity/club/protocol/protocolVoting";
+import InternalException from "../../../exceptions/internalException";
 import { SynchronizeProtocolVotingCommand } from "./protocolVotingCommand";
 
 export default abstract class ProtocolVotingCommandHandler {

src/command/refreshCommandHandler.ts

@@ -4,7 +4,7 @@ import { REFRESH_EXPIRATION } from "../env.defaults";
 import InternalException from "../exceptions/internalException";
 import { JWTHelper } from "../helpers/jwtHelper";
 import { StringHelper } from "../helpers/stringHelper";
-import UserService from "../service/userService";
+import UserService from "../service/user/userService";
 import { JWTRefresh } from "../type/jwtTypes";
 import { CreateRefreshCommand, DeleteRefreshCommand } from "./refreshCommand";
 import ms from "ms";

src/command/settings/award/awardCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { award } from "../entity/award";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { award } from "../../../entity/settings/award";
+import InternalException from "../../../exceptions/internalException";
 import { CreateAwardCommand, DeleteAwardCommand, UpdateAwardCommand } from "./awardCommand";
 
 export default abstract class AwardCommandHandler {

src/command/settings/calendarType/calendarTypeCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { calendarType } from "../entity/calendarType";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { calendarType } from "../../../entity/settings/calendarType";
+import InternalException from "../../../exceptions/internalException";
 import { CreateCalendarTypeCommand, DeleteCalendarTypeCommand, UpdateCalendarTypeCommand } from "./calendarTypeCommand";
 
 export default abstract class CalendarTypeCommandHandler {

src/command/settings/communicationType/communicationTypeCommand.ts

@@ -1,4 +1,4 @@
-import { CommunicationFieldType } from "../type/fieldTypes";
+import { CommunicationFieldType } from "../../../type/fieldTypes";
 
 export interface CreateCommunicationTypeCommand {
   type: string;

src/command/settings/communicationType/communicationTypeCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { communicationType } from "../entity/communicationType";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { communicationType } from "../../../entity/settings/communicationType";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateCommunicationTypeCommand,
   DeleteCommunicationTypeCommand,

src/command/settings/executivePosition/executivePositionCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { executivePosition } from "../entity/executivePosition";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { executivePosition } from "../../../entity/settings/executivePosition";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateExecutivePositionCommand,
   DeleteExecutivePositionCommand,

src/command/settings/membershipStatus/membershipStatusCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { membershipStatus } from "../entity/membershipStatus";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { membershipStatus } from "../../../entity/settings/membershipStatus";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateMembershipStatusCommand,
   DeleteMembershipStatusCommand,

src/command/settings/newsletterConfig/newsletterConfigCommand.ts

@@ -1,4 +1,4 @@
-import { NewsletterConfigType } from "../enums/newsletterConfigType";
+import { NewsletterConfigType } from "../../../enums/newsletterConfigType";
 
 export interface SetNewsletterConfigCommand {
   comTypeId: number;

src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { newsletterConfig } from "../entity/newsletterConfig";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { newsletterConfig } from "../../../entity/settings/newsletterConfig";
+import InternalException from "../../../exceptions/internalException";
 import { DeleteNewsletterConfigCommand, SetNewsletterConfigCommand } from "./newsletterConfigCommand";
 
 export default abstract class NewsletterConfigCommandHandler {

src/command/settings/qualification/qualificationCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { qualification } from "../entity/qualification";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { qualification } from "../../../entity/settings/qualification";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateQualificationCommand,
   DeleteQualificationCommand,

src/command/settings/queryStore/queryStoreCommand.ts

@@ -1,4 +1,4 @@
-import { DynamicQueryStructure } from "../type/dynamicQueries";
+import { DynamicQueryStructure } from "../../../type/dynamicQueries";
 
 export interface CreateQueryStoreCommand {
   title: string;

src/command/settings/queryStore/queryStoreCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { query } from "../entity/query";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { query } from "../../../entity/settings/query";
+import InternalException from "../../../exceptions/internalException";
 import { CreateQueryStoreCommand, DeleteQueryStoreCommand, UpdateQueryStoreCommand } from "./queryStoreCommand";
 
 export default abstract class QueryStoreCommandHandler {

src/command/settings/template/templateCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { template } from "../entity/template";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { template } from "../../../entity/settings/template";
+import InternalException from "../../../exceptions/internalException";
 import { CreateTemplateCommand, DeleteTemplateCommand, UpdateTemplateCommand } from "./templateCommand";
 
 export default abstract class TemplateCommandHandler {

src/command/settings/templateUsage/templateUsageCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { templateUsage } from "../entity/templateUsage";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { templateUsage } from "../../../entity/settings/templateUsage";
+import InternalException from "../../../exceptions/internalException";
 import { UpdateTemplateUsageCommand } from "./templateUsageCommand";
 
 export default abstract class TemplateUsageCommandHandler {

src/command/user/role/roleCommandHandler.ts

@@ -1,6 +1,6 @@
-import { dataSource } from "../data-source";
-import { role } from "../entity/role";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { role } from "../../../entity/user/role";
+import InternalException from "../../../exceptions/internalException";
 import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "./roleCommand";
 
 export default abstract class RoleCommandHandler {

src/command/user/role/rolePermissionCommand.ts

@@ -1,4 +1,4 @@
-import { PermissionString } from "../type/permissionTypes";
+import { PermissionString } from "../../../type/permissionTypes";
 
 export interface CreateRolePermissionCommand {
   permission: PermissionString;

src/command/user/role/rolePermissionCommandHandler.ts

@@ -1,17 +1,17 @@
 import { DeleteResult, EntityManager, InsertResult } from "typeorm";
-import { dataSource } from "../data-source";
-import { rolePermission } from "../entity/role_permission";
-import InternalException from "../exceptions/internalException";
-import RoleService from "../service/roleService";
+import { dataSource } from "../../../data-source";
+import { rolePermission } from "../../../entity/user/role_permission";
+import InternalException from "../../../exceptions/internalException";
+import RoleService from "../../../service/user/roleService";
 import {
   CreateRolePermissionCommand,
   DeleteRolePermissionCommand,
   UpdateRolePermissionsCommand,
 } from "./rolePermissionCommand";
-import PermissionHelper from "../helpers/permissionHelper";
-import RolePermissionService from "../service/rolePermissionService";
-import { role } from "../entity/role";
-import { PermissionString } from "../type/permissionTypes";
+import PermissionHelper from "../../../helpers/permissionHelper";
+import RolePermissionService from "../../../service/user/rolePermissionService";
+import { role } from "../../../entity/user/role";
+import { PermissionString } from "../../../type/permissionTypes";
 
 export default abstract class RolePermissionCommandHandler {
   /**

src/command/user/user/inviteCommandHandler.ts

@@ -1,7 +1,7 @@
-import { dataSource } from "../data-source";
-import { invite } from "../entity/invite";
-import InternalException from "../exceptions/internalException";
-import { StringHelper } from "../helpers/stringHelper";
+import { dataSource } from "../../../data-source";
+import { invite } from "../../../entity/user/invite";
+import InternalException from "../../../exceptions/internalException";
+import { StringHelper } from "../../../helpers/stringHelper";
 import { CreateInviteCommand, DeleteInviteCommand } from "./inviteCommand";
 
 export default abstract class InviteCommandHandler {

src/command/user/user/userCommandHandler.ts

@@ -1,7 +1,7 @@
 import { EntityManager } from "typeorm";
-import { dataSource } from "../data-source";
-import { user } from "../entity/user";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { user } from "../../../entity/user/user";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateUserCommand,
   DeleteUserCommand,
@@ -10,7 +10,7 @@ import {
   UpdateUserRolesCommand,
   UpdateUserSecretCommand,
 } from "./userCommand";
-import UserService from "../service/userService";
+import UserService from "../../../service/user/userService";
 
 export default abstract class UserCommandHandler {
   /**

src/command/user/user/userPermissionCommand.ts

@@ -1,4 +1,4 @@
-import { PermissionString } from "../type/permissionTypes";
+import { PermissionString } from "../../../type/permissionTypes";
 
 export interface CreateUserPermissionCommand {
   permission: PermissionString;

src/command/user/user/userPermissionCommandHandler.ts

@@ -1,16 +1,16 @@
 import { DeleteResult, EntityManager, InsertResult } from "typeorm";
-import { dataSource } from "../data-source";
-import { user } from "../entity/user";
-import { userPermission } from "../entity/user_permission";
-import InternalException from "../exceptions/internalException";
+import { dataSource } from "../../../data-source";
+import { user } from "../../../entity/user/user";
+import { userPermission } from "../../../entity/user/user_permission";
+import InternalException from "../../../exceptions/internalException";
 import {
   CreateUserPermissionCommand,
   DeleteUserPermissionCommand,
   UpdateUserPermissionsCommand,
 } from "./userPermissionCommand";
-import UserPermissionService from "../service/userPermissionService";
-import PermissionHelper from "../helpers/permissionHelper";
-import { PermissionString } from "../type/permissionTypes";
+import UserPermissionService from "../../../service/user/userPermissionService";
+import PermissionHelper from "../../../helpers/permissionHelper";
+import { PermissionString } from "../../../type/permissionTypes";
 
 export default abstract class UserPermissionCommandHandler {
   /**