Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 10 Pull requests Projects Releases 6 Packages Wiki Activity Actions

#25-cleanup-&-enhancements #31

Merged
jkeffects merged 7 commits from #25-cleanup-&-enhancements into main 2025-01-05 15:12:11 +00:00
Conversation 0 Commits 7 Files changed 260 +635 -635
242 changed files with 635 additions and 635 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 84e2ec72ac - Show all commits

0
src/command/calendarCommand.ts → src/command/club/calendar/calendarCommand.ts
View file

8
src/command/calendarCommandHandler.ts → src/command/club/calendar/calendarCommandHandler.ts
View file

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

0
src/command/communicationCommand.ts → src/command/club/member/communicationCommand.ts
View file

10
src/command/communicationCommandHandler.ts → src/command/club/member/communicationCommandHandler.ts
View file

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

0
src/command/memberAwardCommand.ts → src/command/club/member/memberAwardCommand.ts
View file

10
src/command/memberAwardCommandHandler.ts → src/command/club/member/memberAwardCommandHandler.ts
View file

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

2
src/command/memberCommand.ts → src/command/club/member/memberCommand.ts
View file

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

10
src/command/memberCommandHandler.ts → src/command/club/member/memberCommandHandler.ts
View file

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

0
src/command/memberExecutivePositionCommand.ts → src/command/club/member/memberExecutivePositionCommand.ts
View file

10
src/command/memberExecutivePositionCommandHandler.ts → src/command/club/member/memberExecutivePositionCommandHandler.ts
View file

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

0
src/command/memberQualificationCommand.ts → src/command/club/member/memberQualificationCommand.ts
View file

10
src/command/memberQualificationCommandHandler.ts → src/command/club/member/memberQualificationCommandHandler.ts
View file

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

0
src/command/membershipCommand.ts → src/command/club/member/membershipCommand.ts
View file

10
src/command/membershipCommandHandler.ts → src/command/club/member/membershipCommandHandler.ts
View file

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

0
src/command/newsletterCommand.ts → src/command/club/newsletter/newsletterCommand.ts
View file

6
src/command/newsletterCommandHandler.ts → src/command/club/newsletter/newsletterCommandHandler.ts
View file

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

0
src/command/newsletterDatesCommand.ts → src/command/club/newsletter/newsletterDatesCommand.ts
View file

8
src/command/newsletterDatesCommandHandler.ts → src/command/club/newsletter/newsletterDatesCommandHandler.ts
View file

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

0
src/command/newsletterRecipientsCommand.ts → src/command/club/newsletter/newsletterRecipientsCommand.ts
View file

8
src/command/newsletterRecipientsCommandHandler.ts → src/command/club/newsletter/newsletterRecipientsCommandHandler.ts
View file

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

0
src/command/protocolAgendaCommand.ts → src/command/club/protocol/protocolAgendaCommand.ts
View file

6
src/command/protocolAgendaCommandHandler.ts → src/command/club/protocol/protocolAgendaCommandHandler.ts
View file

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

0
src/command/protocolCommand.ts → src/command/club/protocol/protocolCommand.ts
View file

6
src/command/protocolCommandHandler.ts → src/command/club/protocol/protocolCommandHandler.ts
View file

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

0
src/command/protocolDecisionCommand.ts → src/command/club/protocol/protocolDecisionCommand.ts
View file

6
src/command/protocolDecisionCommandHandler.ts → src/command/club/protocol/protocolDecisionCommandHandler.ts
View file

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

0
src/command/protocolPresenceCommand.ts → src/command/club/protocol/protocolPresenceCommand.ts
View file

8
src/command/protocolPresenceCommandHandler.ts → src/command/club/protocol/protocolPresenceCommandHandler.ts
View file

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

0
src/command/protocolPrintoutCommand.ts → src/command/club/protocol/protocolPrintoutCommand.ts
View file

6
src/command/protocolPrintoutCommandHandler.ts → src/command/club/protocol/protocolPrintoutCommandHandler.ts
View file

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

0
src/command/protocolVotingCommand.ts → src/command/club/protocol/protocolVotingCommand.ts
View file

6
src/command/protocolVotingCommandHandler.ts → src/command/club/protocol/protocolVotingCommandHandler.ts
View file

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

2
src/command/refreshCommandHandler.ts
View file

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

0
src/command/awardCommand.ts → src/command/settings/award/awardCommand.ts
View file

6
src/command/awardCommandHandler.ts → src/command/settings/award/awardCommandHandler.ts
View file

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

0
src/command/calendarTypeCommand.ts → src/command/settings/calendarType/calendarTypeCommand.ts
View file

6
src/command/calendarTypeCommandHandler.ts → src/command/settings/calendarType/calendarTypeCommandHandler.ts
View file

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

2
src/command/communicationTypeCommand.ts → src/command/settings/communicationType/communicationTypeCommand.ts
View file

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

6
src/command/communicationTypeCommandHandler.ts → src/command/settings/communicationType/communicationTypeCommandHandler.ts
View file

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

0
src/command/executivePositionCommand.ts → src/command/settings/executivePosition/executivePositionCommand.ts
View file

6
src/command/executivePositionCommandHandler.ts → src/command/settings/executivePosition/executivePositionCommandHandler.ts
View file

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

0
src/command/membershipStatusCommand.ts → src/command/settings/membershipStatus/membershipStatusCommand.ts
View file

6
src/command/membershipStatusCommandHandler.ts → src/command/settings/membershipStatus/membershipStatusCommandHandler.ts
View file

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

2
src/command/newsletterConfigCommand.ts → src/command/settings/newsletterConfig/newsletterConfigCommand.ts
View file

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

6
src/command/newsletterConfigCommandHandler.ts → src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts
View file

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

0
src/command/qualificationCommand.ts → src/command/settings/qualification/qualificationCommand.ts
View file

6
src/command/qualificationCommandHandler.ts → src/command/settings/qualification/qualificationCommandHandler.ts
View file

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

2
src/command/queryStoreCommand.ts → src/command/settings/queryStore/queryStoreCommand.ts
View file

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

6
src/command/queryStoreCommandHandler.ts → src/command/settings/queryStore/queryStoreCommandHandler.ts
View file

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

0
src/command/templateCommand.ts → src/command/settings/template/templateCommand.ts
View file

6
src/command/templateCommandHandler.ts → src/command/settings/template/templateCommandHandler.ts
View file

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

0
src/command/templateUsageCommand.ts → src/command/settings/templateUsage/templateUsageCommand.ts
View file

6
src/command/templateUsageCommandHandler.ts → src/command/settings/templateUsage/templateUsageCommandHandler.ts
View file

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

0
src/command/roleCommand.ts → src/command/user/role/roleCommand.ts
View file

6
src/command/roleCommandHandler.ts → src/command/user/role/roleCommandHandler.ts
View file

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

2
src/command/rolePermissionCommand.ts → src/command/user/role/rolePermissionCommand.ts
View file

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

16
src/command/rolePermissionCommandHandler.ts → src/command/user/role/rolePermissionCommandHandler.ts
View file

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

0
src/command/inviteCommand.ts → src/command/user/user/inviteCommand.ts
View file

8
src/command/inviteCommandHandler.ts → src/command/user/user/inviteCommandHandler.ts
View file

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

0
src/command/userCommand.ts → src/command/user/user/userCommand.ts
View file

8
src/command/userCommandHandler.ts → src/command/user/user/userCommandHandler.ts
View file

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

2
src/command/userPermissionCommand.ts → src/command/user/user/userPermissionCommand.ts
View file

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

14
src/command/userPermissionCommandHandler.ts → src/command/user/user/userPermissionCommandHandler.ts
View file

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

16
src/controller/admin/calendarController.ts → src/controller/admin/club/calendarController.ts
View file

@ -1,16 +1,16 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import CalendarService from "../../service/calendarService"; import CalendarService from "../../../service/club/calendarService";
import CalendarFactory from "../../factory/admin/calendar"; import CalendarFactory from "../../../factory/admin/club/calendar";
import CalendarTypeService from "../../service/calendarTypeService"; import CalendarTypeService from "../../../service/settings/calendarTypeService";
import CalendarTypeFactory from "../../factory/admin/calendarType"; import CalendarTypeFactory from "../../../factory/admin/settings/calendarType";
import { CreateCalendarCommand, DeleteCalendarCommand, UpdateCalendarCommand } from "../../command/calendarCommand"; import { CreateCalendarCommand, DeleteCalendarCommand, UpdateCalendarCommand } from "../../../command/club/calendar/calendarCommand";
import CalendarCommandHandler from "../../command/calendarCommandHandler"; import CalendarCommandHandler from "../../../command/club/calendar/calendarCommandHandler";
import { import {
CreateCalendarTypeCommand, CreateCalendarTypeCommand,
DeleteCalendarTypeCommand, DeleteCalendarTypeCommand,
UpdateCalendarTypeCommand, UpdateCalendarTypeCommand,
} from "../../command/calendarTypeCommand"; } from "../../../command/settings/calendarType/calendarTypeCommand";
import CalendarTypeCommandHandler from "../../command/calendarTypeCommandHandler"; import CalendarTypeCommandHandler from "../../../command/settings/calendarType/calendarTypeCommandHandler";
/** /**
* @description get all calendar items * @description get all calendar items

52
src/controller/admin/memberController.ts → src/controller/admin/club/memberController.ts
View file

@ -1,55 +1,55 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import MemberService from "../../service/memberService"; import MemberService from "../../../service/club/member/memberService";
import MemberFactory from "../../factory/admin/member"; import MemberFactory from "../../../factory/admin/club/member/member";
import MembershipService from "../../service/membershipService"; import MembershipService from "../../../service/club/member/membershipService";
import MembershipFactory from "../../factory/admin/membership"; import MembershipFactory from "../../../factory/admin/club/member/membership";
import MemberAwardService from "../../service/memberAwardService"; import MemberAwardService from "../../../service/club/member/memberAwardService";
import MemberAwardFactory from "../../factory/admin/memberAward"; import MemberAwardFactory from "../../../factory/admin/club/member/memberAward";
import MemberQualificationService from "../../service/memberQualificationService"; import MemberQualificationService from "../../../service/club/member/memberQualificationService";
import MemberQualificationFactory from "../../factory/admin/memberQualification"; import MemberQualificationFactory from "../../../factory/admin/club/member/memberQualification";
import MemberExecutivePositionService from "../../service/memberExecutivePositionService"; import MemberExecutivePositionService from "../../../service/club/member/memberExecutivePositionService";
import MemberExecutivePositionFactory from "../../factory/admin/memberExecutivePosition"; import MemberExecutivePositionFactory from "../../../factory/admin/club/member/memberExecutivePosition";
import CommunicationService from "../../service/communicationService"; import CommunicationService from "../../../service/club/member/communicationService";
import CommunicationFactory from "../../factory/admin/communication"; import CommunicationFactory from "../../../factory/admin/club/member/communication";
import { import {
CreateMemberCommand, CreateMemberCommand,
DeleteMemberCommand, DeleteMemberCommand,
UpdateMemberCommand, UpdateMemberCommand,
UpdateMemberNewsletterCommand, UpdateMemberNewsletterCommand,
} from "../../command/memberCommand"; } from "../../../command/club/member/memberCommand";
import MemberCommandHandler from "../../command/memberCommandHandler"; import MemberCommandHandler from "../../../command/club/member/memberCommandHandler";
import { import {
CreateMembershipCommand, CreateMembershipCommand,
DeleteMembershipCommand, DeleteMembershipCommand,
UpdateMembershipCommand, UpdateMembershipCommand,
} from "../../command/membershipCommand"; } from "../../../command/club/member/membershipCommand";
import MembershipCommandHandler from "../../command/membershipCommandHandler"; import MembershipCommandHandler from "../../../command/club/member/membershipCommandHandler";
import { import {
CreateMemberAwardCommand, CreateMemberAwardCommand,
DeleteMemberAwardCommand, DeleteMemberAwardCommand,
UpdateMemberAwardCommand, UpdateMemberAwardCommand,
} from "../../command/memberAwardCommand"; } from "../../../command/club/member/memberAwardCommand";
import MemberAwardCommandHandler from "../../command/memberAwardCommandHandler"; import MemberAwardCommandHandler from "../../../command/club/member/memberAwardCommandHandler";
import { import {
CreateMemberExecutivePositionCommand, CreateMemberExecutivePositionCommand,
DeleteMemberExecutivePositionCommand, DeleteMemberExecutivePositionCommand,
UpdateMemberExecutivePositionCommand, UpdateMemberExecutivePositionCommand,
} from "../../command/memberExecutivePositionCommand"; } from "../../../command/club/member/memberExecutivePositionCommand";
import MemberExecutivePositionCommandHandler from "../../command/memberExecutivePositionCommandHandler"; import MemberExecutivePositionCommandHandler from "../../../command/club/member/memberExecutivePositionCommandHandler";
import { import {
CreateMemberQualificationCommand, CreateMemberQualificationCommand,
DeleteMemberQualificationCommand, DeleteMemberQualificationCommand,
UpdateMemberQualificationCommand, UpdateMemberQualificationCommand,
} from "../../command/memberQualificationCommand"; } from "../../../command/club/member/memberQualificationCommand";
import MemberQualificationCommandHandler from "../../command/memberQualificationCommandHandler"; import MemberQualificationCommandHandler from "../../../command/club/member/memberQualificationCommandHandler";
import { import {
CreateCommunicationCommand, CreateCommunicationCommand,
DeleteCommunicationCommand, DeleteCommunicationCommand,
UpdateCommunicationCommand, UpdateCommunicationCommand,
} from "../../command/communicationCommand"; } from "../../../command/club/member/communicationCommand";
import CommunicationCommandHandler from "../../command/communicationCommandHandler"; import CommunicationCommandHandler from "../../../command/club/member/communicationCommandHandler";
import {PdfExport} from "../../helpers/pdfExport"; import {PdfExport} from "../../../helpers/pdfExport";
import {PermissionModule} from "../../type/permissionTypes"; import {PermissionModule} from "../../../type/permissionTypes";
/** /**
* @description get all members * @description get all members

40
src/controller/admin/newsletterController.ts → src/controller/admin/club/newsletterController.ts
View file

@ -1,24 +1,24 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import NewsletterService from "../../service/newsletterService"; import NewsletterService from "../../../service/club/newsletter/newsletterService";
import NewsletterFactory from "../../factory/admin/newsletter"; import NewsletterFactory from "../../../factory/admin/club/newsletter/newsletter";
import NewsletterDatesService from "../../service/newsletterDatesService"; import NewsletterDatesService from "../../../service/club/newsletter/newsletterDatesService";
import NewsletterDatesFactory from "../../factory/admin/newsletterDates"; import NewsletterDatesFactory from "../../../factory/admin/club/newsletter/newsletterDates";
import NewsletterRecipientsService from "../../service/newsletterRecipientsService"; import NewsletterRecipientsService from "../../../service/club/newsletter/newsletterRecipientsService";
import NewsletterRecipientsFactory from "../../factory/admin/newsletterRecipients"; import NewsletterRecipientsFactory from "../../../factory/admin/club/newsletter/newsletterRecipients";
import { FileSystemHelper } from "../../helpers/fileSystemHelper"; import { FileSystemHelper } from "../../../helpers/fileSystemHelper";
import { CreateNewsletterCommand, SynchronizeNewsletterCommand } from "../../command/newsletterCommand"; import { CreateNewsletterCommand, SynchronizeNewsletterCommand } from "../../../command/club/newsletter/newsletterCommand";
import NewsletterCommandHandler from "../../command/newsletterCommandHandler"; import NewsletterCommandHandler from "../../../command/club/newsletter/newsletterCommandHandler";
import { SynchronizeNewsletterDatesCommand } from "../../command/newsletterDatesCommand"; import { SynchronizeNewsletterDatesCommand } from "../../../command/club/newsletter/newsletterDatesCommand";
import NewsletterDatesCommandHandler from "../../command/newsletterDatesCommandHandler"; import NewsletterDatesCommandHandler from "../../../command/club/newsletter/newsletterDatesCommandHandler";
import { SynchronizeNewsletterRecipientsCommand } from "../../command/newsletterRecipientsCommand"; import { SynchronizeNewsletterRecipientsCommand } from "../../../command/club/newsletter/newsletterRecipientsCommand";
import NewsletterRecipientsCommandHandler from "../../command/newsletterRecipientsCommandHandler"; import NewsletterRecipientsCommandHandler from "../../../command/club/newsletter/newsletterRecipientsCommandHandler";
import { NewsletterDatesViewModel } from "../../viewmodel/admin/newsletterDates.models"; import { NewsletterDatesViewModel } from "../../../viewmodel/admin/club/newsletter/newsletterDates.models";
import { PdfExport } from "../../helpers/pdfExport"; import { PdfExport } from "../../../helpers/pdfExport";
import UserService from "../../service/userService"; import UserService from "../../../service/user/userService";
import { TemplateHelper } from "../../helpers/templateHelper"; import { TemplateHelper } from "../../../helpers/templateHelper";
import MailHelper from "../../helpers/mailHelper"; import MailHelper from "../../../helpers/mailHelper";
import { NewsletterEventType, NewsletterHelper } from "../../helpers/newsletterHelper"; import { NewsletterEventType, NewsletterHelper } from "../../../helpers/newsletterHelper";
import { Salutation } from "../../enums/salutation"; import { Salutation } from "../../../enums/salutation";
/** /**
* @description get all newsletters * @description get all newsletters

60
src/controller/admin/protocolController.ts → src/controller/admin/club/protocolController.ts
View file

@ -1,34 +1,34 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import ProtocolService from "../../service/protocolService"; import ProtocolService from "../../../service/club/protocol/protocolService";
import ProtocolFactory from "../../factory/admin/protocol"; import ProtocolFactory from "../../../factory/admin/club/protocol/protocol";
import ProtocolAgendaService from "../../service/protocolAgendaService"; import ProtocolAgendaService from "../../../service/club/protocol/protocolAgendaService";
import ProtocolAgendaFactory from "../../factory/admin/protocolAgenda"; import ProtocolAgendaFactory from "../../../factory/admin/club/protocol/protocolAgenda";
import ProtocolDecisionService from "../../service/protocolDecisionService"; import ProtocolDecisionService from "../../../service/club/protocol/protocolDecisionService";
import ProtocolDecisionFactory from "../../factory/admin/protocolDecision"; import ProtocolDecisionFactory from "../../../factory/admin/club/protocol/protocolDecision";
import ProtocolPresenceService from "../../service/protocolPrecenseService"; import ProtocolPresenceService from "../../../service/club/protocol/protocolPrecenseService";
import ProtocolPresenceFactory from "../../factory/admin/protocolPresence"; import ProtocolPresenceFactory from "../../../factory/admin/club/protocol/protocolPresence";
import ProtocolVotingService from "../../service/protocolVotingService"; import ProtocolVotingService from "../../../service/club/protocol/protocolVotingService";
import ProtocolVotingFactory from "../../factory/admin/protocolVoting"; import ProtocolVotingFactory from "../../../factory/admin/club/protocol/protocolVoting";
import { CreateProtocolCommand, SynchronizeProtocolCommand } from "../../command/protocolCommand"; import { CreateProtocolCommand, SynchronizeProtocolCommand } from "../../../command/club/protocol/protocolCommand";
import ProtocolCommandHandler from "../../command/protocolCommandHandler"; import ProtocolCommandHandler from "../../../command/club/protocol/protocolCommandHandler";
import { SynchronizeProtocolAgendaCommand } from "../../command/protocolAgendaCommand"; import { SynchronizeProtocolAgendaCommand } from "../../../command/club/protocol/protocolAgendaCommand";
import ProtocolAgendaCommandHandler from "../../command/protocolAgendaCommandHandler"; import ProtocolAgendaCommandHandler from "../../../command/club/protocol/protocolAgendaCommandHandler";
import { ProtocolAgendaViewModel } from "../../viewmodel/admin/protocolAgenda.models"; import { ProtocolAgendaViewModel } from "../../../viewmodel/admin/club/protocol/protocolAgenda.models";
import ProtocolDecisionCommandHandler from "../../command/protocolDecisionCommandHandler"; import ProtocolDecisionCommandHandler from "../../../command/club/protocol/protocolDecisionCommandHandler";
import { ProtocolDecisionViewModel } from "../../viewmodel/admin/protocolDecision.models"; import { ProtocolDecisionViewModel } from "../../../viewmodel/admin/club/protocol/protocolDecision.models";
import ProtocolPresenceCommandHandler from "../../command/protocolPresenceCommandHandler"; import ProtocolPresenceCommandHandler from "../../../command/club/protocol/protocolPresenceCommandHandler";
import { SynchronizeProtocolPresenceCommand } from "../../command/protocolPresenceCommand"; import { SynchronizeProtocolPresenceCommand } from "../../../command/club/protocol/protocolPresenceCommand";
import { SynchronizeProtocolDecisionCommand } from "../../command/protocolDecisionCommand"; import { SynchronizeProtocolDecisionCommand } from "../../../command/club/protocol/protocolDecisionCommand";
import { SynchronizeProtocolVotingCommand } from "../../command/protocolVotingCommand"; import { SynchronizeProtocolVotingCommand } from "../../../command/club/protocol/protocolVotingCommand";
import { ProtocolVotingViewModel } from "../../viewmodel/admin/protocolVoting.models"; import { ProtocolVotingViewModel } from "../../../viewmodel/admin/club/protocol/protocolVoting.models";
import ProtocolVotingCommandHandler from "../../command/protocolVotingCommandHandler"; import ProtocolVotingCommandHandler from "../../../command/club/protocol/protocolVotingCommandHandler";
import { PdfExport } from "../../helpers/pdfExport"; import { PdfExport } from "../../../helpers/pdfExport";
import ProtocolPrintoutService from "../../service/protocolPrintoutService"; import ProtocolPrintoutService from "../../../service/club/protocol/protocolPrintoutService";
import ProtocolPrintoutFactory from "../../factory/admin/protocolPrintout"; import ProtocolPrintoutFactory from "../../../factory/admin/club/protocol/protocolPrintout";
import { CreateProtocolPrintoutCommand } from "../../command/protocolPrintoutCommand"; import { CreateProtocolPrintoutCommand } from "../../../command/club/protocol/protocolPrintoutCommand";
import ProtocolPrintoutCommandHandler from "../../command/protocolPrintoutCommandHandler"; import ProtocolPrintoutCommandHandler from "../../../command/club/protocol/protocolPrintoutCommandHandler";
import { FileSystemHelper } from "../../helpers/fileSystemHelper"; import { FileSystemHelper } from "../../../helpers/fileSystemHelper";
import { ProtocolPresenceViewModel } from "../../viewmodel/admin/protocolPresence.models"; import { ProtocolPresenceViewModel } from "../../../viewmodel/admin/club/protocol/protocolPresence.models";
/** /**
* @description get all protocols * @description get all protocols

4
src/controller/admin/queryBuilderController.ts → src/controller/admin/club/queryBuilderController.ts
View file

@ -1,6 +1,6 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import DynamicQueryBuilder from "../../helpers/dynamicQueryBuilder"; import DynamicQueryBuilder from "../../../helpers/dynamicQueryBuilder";
import { dataSource } from "../../data-source"; import { dataSource } from "../../../data-source";
/** /**
* @description get all table metas * @description get all table metas

8
src/controller/admin/awardController.ts → src/controller/admin/settings/awardController.ts
View file

@ -1,8 +1,8 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import AwardService from "../../service/awardService"; import AwardService from "../../../service/settings/awardService";
import AwardFactory from "../../factory/admin/award"; import AwardFactory from "../../../factory/admin/settings/award";
import { CreateAwardCommand, DeleteAwardCommand, UpdateAwardCommand } from "../../command/awardCommand"; import { CreateAwardCommand, DeleteAwardCommand, UpdateAwardCommand } from "../../../command/settings/award/awardCommand";
import AwardCommandHandler from "../../command/awardCommandHandler"; import AwardCommandHandler from "../../../command/settings/award/awardCommandHandler";
/** /**
* @description get all awards * @description get all awards

10
src/controller/admin/communicationTypeController.ts → src/controller/admin/settings/communicationTypeController.ts
View file

@ -1,13 +1,13 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import CommunicationTypeService from "../../service/communicationTypeService"; import CommunicationTypeService from "../../../service/settings/communicationTypeService";
import CommunicationTypeFactory from "../../factory/admin/communicationType"; import CommunicationTypeFactory from "../../../factory/admin/settings/communicationType";
import CommunicationService from "../../service/communicationService"; import CommunicationService from "../../../service/club/member/communicationService";
import { import {
CreateCommunicationTypeCommand, CreateCommunicationTypeCommand,
DeleteCommunicationTypeCommand, DeleteCommunicationTypeCommand,
UpdateCommunicationTypeCommand, UpdateCommunicationTypeCommand,
} from "../../command/communicationTypeCommand"; } from "../../../command/settings/communicationType/communicationTypeCommand";
import CommunicationTypeCommandHandler from "../../command/communicationTypeCommandHandler"; import CommunicationTypeCommandHandler from "../../../command/settings/communicationType/communicationTypeCommandHandler";
/** /**
* @description get all communicationTypes * @description get all communicationTypes

8
src/controller/admin/executivePositionController.ts → src/controller/admin/settings/executivePositionController.ts
View file

@ -1,12 +1,12 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import ExecutivePositionService from "../../service/executivePositionService"; import ExecutivePositionService from "../../../service/settings/executivePositionService";
import ExecutivePositionFactory from "../../factory/admin/executivePosition"; import ExecutivePositionFactory from "../../../factory/admin/settings/executivePosition";
import { import {
CreateExecutivePositionCommand, CreateExecutivePositionCommand,
DeleteExecutivePositionCommand, DeleteExecutivePositionCommand,
UpdateExecutivePositionCommand, UpdateExecutivePositionCommand,
} from "../../command/executivePositionCommand"; } from "../../../command/settings/executivePosition/executivePositionCommand";
import ExecutivePositionCommandHandler from "../../command/executivePositionCommandHandler"; import ExecutivePositionCommandHandler from "../../../command/settings/executivePosition/executivePositionCommandHandler";
/** /**
* @description get all executivePositions * @description get all executivePositions

8
src/controller/admin/membershipStatusController.ts → src/controller/admin/settings/membershipStatusController.ts
View file

@ -1,12 +1,12 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import MembershipStatusService from "../../service/membershipStatusService"; import MembershipStatusService from "../../../service/settings/membershipStatusService";
import MembershipStatusFactory from "../../factory/admin/membershipStatus"; import MembershipStatusFactory from "../../../factory/admin/settings/membershipStatus";
import { import {
CreateMembershipStatusCommand, CreateMembershipStatusCommand,
DeleteMembershipStatusCommand, DeleteMembershipStatusCommand,
UpdateMembershipStatusCommand, UpdateMembershipStatusCommand,
} from "../../command/membershipStatusCommand"; } from "../../../command/settings/membershipStatus/membershipStatusCommand";
import MembershipStatusCommandHandler from "../../command/membershipStatusCommandHandler"; import MembershipStatusCommandHandler from "../../../command/settings/membershipStatus/membershipStatusCommandHandler";
/** /**
* @description get all membershipStatus * @description get all membershipStatus

8
src/controller/admin/newsletterConfigController.ts → src/controller/admin/settings/newsletterConfigController.ts
View file

@ -1,8 +1,8 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import NewsletterConfigService from "../../service/newsletterConfigService"; import NewsletterConfigService from "../../../service/settings/newsletterConfigService";
import NewsletterConfigFactory from "../../factory/admin/newsletterConfig"; import NewsletterConfigFactory from "../../../factory/admin/settings/newsletterConfig";
import NewsletterConfigCommandHandler from "../../command/newsletterConfigCommandHandler"; import NewsletterConfigCommandHandler from "../../../command/settings/newsletterConfig/newsletterConfigCommandHandler";
import { DeleteNewsletterConfigCommand, SetNewsletterConfigCommand } from "../../command/newsletterConfigCommand"; import { DeleteNewsletterConfigCommand, SetNewsletterConfigCommand } from "../../../command/settings/newsletterConfig/newsletterConfigCommand";
/** /**
* @description get all newsletterConfigs * @description get all newsletterConfigs

8
src/controller/admin/qualificationController.ts → src/controller/admin/settings/qualificationController.ts
View file

@ -1,12 +1,12 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import QualificationService from "../../service/qualification"; import QualificationService from "../../../service/settings/qualification";
import QualificationFactory from "../../factory/admin/qualification"; import QualificationFactory from "../../../factory/admin/settings/qualification";
import { import {
CreateQualificationCommand, CreateQualificationCommand,
DeleteQualificationCommand, DeleteQualificationCommand,
UpdateQualificationCommand, UpdateQualificationCommand,
} from "../../command/qualificationCommand"; } from "../../../command/settings/qualification/qualificationCommand";
import QualificationCommandHandler from "../../command/qualificationCommandHandler"; import QualificationCommandHandler from "../../../command/settings/qualification/qualificationCommandHandler";
/** /**
* @description get all qualifications * @description get all qualifications

8
src/controller/admin/queryStoreController.ts → src/controller/admin/settings/queryStoreController.ts
View file

@ -1,12 +1,12 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import QueryStoreFactory from "../../factory/admin/queryStore"; import QueryStoreFactory from "../../../factory/admin/settings/queryStore";
import QueryStoreService from "../../service/queryStoreService"; import QueryStoreService from "../../../service/settings/queryStoreService";
import { import {
CreateQueryStoreCommand, CreateQueryStoreCommand,
DeleteQueryStoreCommand, DeleteQueryStoreCommand,
UpdateQueryStoreCommand, UpdateQueryStoreCommand,
} from "../../command/queryStoreCommand"; } from "../../../command/settings/queryStore/queryStoreCommand";
import QueryStoreCommandHandler from "../../command/queryStoreCommandHandler"; import QueryStoreCommandHandler from "../../../command/settings/queryStore/queryStoreCommandHandler";
/** /**
* @description get all queryStores * @description get all queryStores

8
src/controller/admin/templateController.ts → src/controller/admin/settings/templateController.ts
View file

@ -1,8 +1,8 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import TemplateService from "../../service/templateService"; import TemplateService from "../../../service/settings/templateService";
import TemplateFactory from "../../factory/admin/template"; import TemplateFactory from "../../../factory/admin/settings/template";
import { CreateTemplateCommand, DeleteTemplateCommand, UpdateTemplateCommand } from "../../command/templateCommand"; import { CreateTemplateCommand, DeleteTemplateCommand, UpdateTemplateCommand } from "../../../command/settings/template/templateCommand";
import TemplateCommandHandler from "../../command/templateCommandHandler"; import TemplateCommandHandler from "../../../command/settings/template/templateCommandHandler";
/** /**
* @description get all templates * @description get all templates

18
src/controller/admin/templateUsageController.ts → src/controller/admin/settings/templateUsageController.ts
View file

@ -1,13 +1,13 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import TemplateUsageService from "../../service/templateUsageService"; import TemplateUsageService from "../../../service/settings/templateUsageService";
import TemplateUsageFactory from "../../factory/admin/templateUsage"; import TemplateUsageFactory from "../../../factory/admin/settings/templateUsage";
import { UpdateTemplateUsageCommand } from "../../command/templateUsageCommand"; import { UpdateTemplateUsageCommand } from "../../../command/settings/templateUsage/templateUsageCommand";
import TemplateUsageCommandHandler from "../../command/templateUsageCommandHandler"; import TemplateUsageCommandHandler from "../../../command/settings/templateUsage/templateUsageCommandHandler";
import PermissionHelper from "../../helpers/permissionHelper"; import PermissionHelper from "../../../helpers/permissionHelper";
import ForbiddenRequestException from "../../exceptions/forbiddenRequestException"; import ForbiddenRequestException from "../../../exceptions/forbiddenRequestException";
import { PermissionModule } from "../../type/permissionTypes"; import { PermissionModule } from "../../../type/permissionTypes";
import { PdfExport } from "../../helpers/pdfExport"; import { PdfExport } from "../../../helpers/pdfExport";
import { DemoDataHelper } from "../../helpers/demoDataHelper"; import { DemoDataHelper } from "../../../helpers/demoDataHelper";
/** /**
* @description get all templateUsages * @description get all templateUsages

16
src/controller/admin/roleController.ts → src/controller/admin/user/roleController.ts
View file

@ -1,12 +1,12 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import RoleService from "../../service/roleService"; import RoleService from "../../../service/user/roleService";
import RoleFactory from "../../factory/admin/role"; import RoleFactory from "../../../factory/admin/user/role";
import RolePermissionService from "../../service/rolePermissionService"; import RolePermissionService from "../../../service/user/rolePermissionService";
import PermissionHelper from "../../helpers/permissionHelper"; import PermissionHelper from "../../../helpers/permissionHelper";
import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "../../command/roleCommand"; import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "../../../command/user/role/roleCommand";
import RoleCommandHandler from "../../command/roleCommandHandler"; import RoleCommandHandler from "../../../command/user/role/roleCommandHandler";
import { UpdateRolePermissionsCommand } from "../../command/rolePermissionCommand"; import { UpdateRolePermissionsCommand } from "../../../command/user/role/rolePermissionCommand";
import RolePermissionCommandHandler from "../../command/rolePermissionCommandHandler"; import RolePermissionCommandHandler from "../../../command/user/role/rolePermissionCommandHandler";
/** /**
* @description get All roles * @description get All roles

22
src/controller/admin/userController.ts → src/controller/admin/user/userController.ts
View file

@ -1,15 +1,15 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import UserService from "../../service/userService"; import UserService from "../../../service/user/userService";
import UserFactory from "../../factory/admin/user"; import UserFactory from "../../../factory/admin/user/user";
import UserPermissionService from "../../service/userPermissionService"; import UserPermissionService from "../../../service/user/userPermissionService";
import PermissionHelper from "../../helpers/permissionHelper"; import PermissionHelper from "../../../helpers/permissionHelper";
import RoleFactory from "../../factory/admin/role"; import RoleFactory from "../../../factory/admin/user/role";
import { DeleteUserCommand, UpdateUserCommand, UpdateUserRolesCommand } from "../../command/userCommand"; import { DeleteUserCommand, UpdateUserCommand, UpdateUserRolesCommand } from "../../../command/user/user/userCommand";
import UserCommandHandler from "../../command/userCommandHandler"; import UserCommandHandler from "../../../command/user/user/userCommandHandler";
import MailHelper from "../../helpers/mailHelper"; import MailHelper from "../../../helpers/mailHelper";
import { CLUB_NAME } from "../../env.defaults"; import { CLUB_NAME } from "../../../env.defaults";
import { UpdateUserPermissionsCommand } from "../../command/userPermissionCommand"; import { UpdateUserPermissionsCommand } from "../../../command/user/user/userPermissionCommand";
import UserPermissionCommandHandler from "../../command/userPermissionCommandHandler"; import UserPermissionCommandHandler from "../../../command/user/user/userPermissionCommandHandler";
/** /**
* @description get All users * @description get All users

6
src/controller/authController.ts
View file

@ -4,13 +4,13 @@ import { JWTToken } from "../type/jwtTypes";
import InternalException from "../exceptions/internalException"; import InternalException from "../exceptions/internalException";
import RefreshCommandHandler from "../command/refreshCommandHandler"; import RefreshCommandHandler from "../command/refreshCommandHandler";
import { CreateRefreshCommand, DeleteRefreshCommand } from "../command/refreshCommand"; import { CreateRefreshCommand, DeleteRefreshCommand } from "../command/refreshCommand";
import UserService from "../service/userService"; import UserService from "../service/user/userService";
import speakeasy from "speakeasy"; import speakeasy from "speakeasy";
import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException"; import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException";
import RefreshService from "../service/refreshService"; import RefreshService from "../service/refreshService";
import UserPermissionService from "../service/userPermissionService"; import UserPermissionService from "../service/user/userPermissionService";
import PermissionHelper from "../helpers/permissionHelper"; import PermissionHelper from "../helpers/permissionHelper";
import RolePermissionService from "../service/rolePermissionService"; import RolePermissionService from "../service/user/rolePermissionService";
/** /**
* @description Check authentication status by token * @description Check authentication status by token

18
src/controller/inviteController.ts
View file

@ -7,18 +7,18 @@ import { CreateRefreshCommand } from "../command/refreshCommand";
import speakeasy from "speakeasy"; import speakeasy from "speakeasy";
import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException"; import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException";
import QRCode from "qrcode"; import QRCode from "qrcode";
import { CreateUserCommand } from "../command/userCommand"; import { CreateUserCommand } from "../command/user/user/userCommand";
import UserCommandHandler from "../command/userCommandHandler"; import UserCommandHandler from "../command/user/user/userCommandHandler";
import { CreateInviteCommand, DeleteInviteCommand } from "../command/inviteCommand"; import { CreateInviteCommand, DeleteInviteCommand } from "../command/user/user/inviteCommand";
import InviteCommandHandler from "../command/inviteCommandHandler"; import InviteCommandHandler from "../command/user/user/inviteCommandHandler";
import MailHelper from "../helpers/mailHelper"; import MailHelper from "../helpers/mailHelper";
import InviteService from "../service/inviteService"; import InviteService from "../service/user/inviteService";
import UserService from "../service/userService"; import UserService from "../service/user/userService";
import CustomRequestException from "../exceptions/customRequestException"; import CustomRequestException from "../exceptions/customRequestException";
import { CLUB_NAME } from "../env.defaults"; import { CLUB_NAME } from "../env.defaults";
import { CreateUserPermissionCommand } from "../command/userPermissionCommand"; import { CreateUserPermissionCommand } from "../command/user/user/userPermissionCommand";
import UserPermissionCommandHandler from "../command/userPermissionCommandHandler"; import UserPermissionCommandHandler from "../command/user/user/userPermissionCommandHandler";
import InviteFactory from "../factory/admin/invite"; import InviteFactory from "../factory/admin/user/invite";
/** /**
* @description get all invites * @description get all invites

8
src/controller/publicController.ts
View file

@ -1,11 +1,11 @@
import { Request, Response } from "express"; import { Request, Response } from "express";
import CalendarService from "../service/calendarService"; import CalendarService from "../service/club/calendarService";
import CalendarTypeService from "../service/calendarTypeService"; import CalendarTypeService from "../service/settings/calendarTypeService";
import { calendar } from "../entity/calendar"; import { calendar } from "../entity/club/calendar";
import { createEvents } from "ics"; import { createEvents } from "ics";
import moment from "moment"; import moment from "moment";
import InternalException from "../exceptions/internalException"; import InternalException from "../exceptions/internalException";
import CalendarFactory from "../factory/admin/calendar"; import CalendarFactory from "../factory/admin/club/calendar";
import { CalendarHelper } from "../helpers/calendarHelper"; import { CalendarHelper } from "../helpers/calendarHelper";
/** /**

10
src/controller/resetController.ts
View file

@ -11,13 +11,13 @@ import { CreateResetCommand, DeleteResetCommand } from "../command/resetCommand"
import ResetCommandHandler from "../command/resetCommandHandler"; import ResetCommandHandler from "../command/resetCommandHandler";
import MailHelper from "../helpers/mailHelper"; import MailHelper from "../helpers/mailHelper";
import ResetService from "../service/resetService"; import ResetService from "../service/resetService";
import UserService from "../service/userService"; import UserService from "../service/user/userService";
import { CLUB_NAME } from "../env.defaults"; import { CLUB_NAME } from "../env.defaults";
import PermissionHelper from "../helpers/permissionHelper"; import PermissionHelper from "../helpers/permissionHelper";
import RolePermissionService from "../service/rolePermissionService"; import RolePermissionService from "../service/user/rolePermissionService";
import UserPermissionService from "../service/userPermissionService"; import UserPermissionService from "../service/user/userPermissionService";
import { UpdateUserSecretCommand } from "../command/userCommand"; import { UpdateUserSecretCommand } from "../command/user/user/userCommand";
import UserCommandHandler from "../command/userCommandHandler"; import UserCommandHandler from "../command/user/user/userCommandHandler";
/** /**
* @description request totp reset * @description request totp reset

8
src/controller/userController.ts
View file

@ -3,10 +3,10 @@ import speakeasy from "speakeasy";
import QRCode from "qrcode"; import QRCode from "qrcode";
import InternalException from "../exceptions/internalException"; import InternalException from "../exceptions/internalException";
import { CLUB_NAME } from "../env.defaults"; import { CLUB_NAME } from "../env.defaults";
import UserService from "../service/userService"; import UserService from "../service/user/userService";
import UserFactory from "../factory/admin/user"; import UserFactory from "../factory/admin/user/user";
import { TransferUserOwnerCommand, UpdateUserCommand } from "../command/userCommand"; import { TransferUserOwnerCommand, UpdateUserCommand } from "../command/user/user/userCommand";
import UserCommandHandler from "../command/userCommandHandler"; import UserCommandHandler from "../command/user/user/userCommandHandler";
import ForbiddenRequestException from "../exceptions/forbiddenRequestException"; import ForbiddenRequestException from "../exceptions/forbiddenRequestException";
/** /**

62
src/data-source.ts
View file

@ -3,18 +3,18 @@ import "reflect-metadata";
import { DataSource } from "typeorm"; import { DataSource } from "typeorm";
import { DB_HOST, DB_USERNAME, DB_PASSWORD, DB_NAME, DB_TYPE } from "./env.defaults"; import { DB_HOST, DB_USERNAME, DB_PASSWORD, DB_NAME, DB_TYPE } from "./env.defaults";
import { user } from "./entity/user"; import { user } from "./entity/user/user";
import { refresh } from "./entity/refresh"; import { refresh } from "./entity/refresh";
import { invite } from "./entity/invite"; import { invite } from "./entity/user/invite";
import { userPermission } from "./entity/user_permission"; import { userPermission } from "./entity/user/user_permission";
import { role } from "./entity/role"; import { role } from "./entity/user/role";
import { rolePermission } from "./entity/role_permission"; import { rolePermission } from "./entity/user/role_permission";
import { award } from "./entity/award"; import { award } from "./entity/settings/award";
import { communication } from "./entity/communication"; import { communication } from "./entity/club/member/communication";
import { communicationType } from "./entity/communicationType"; import { communicationType } from "./entity/settings/communicationType";
import { executivePosition } from "./entity/executivePosition"; import { executivePosition } from "./entity/settings/executivePosition";
import { membershipStatus } from "./entity/membershipStatus"; import { membershipStatus } from "./entity/settings/membershipStatus";
import { qualification } from "./entity/qualification"; import { qualification } from "./entity/settings/qualification";
import { Initial1724317398939 } from "./migrations/1724317398939-initial"; import { Initial1724317398939 } from "./migrations/1724317398939-initial";
import { RefreshPrimaryChange1724573307851 } from "./migrations/1724573307851-refreshPrimaryChange"; import { RefreshPrimaryChange1724573307851 } from "./migrations/1724573307851-refreshPrimaryChange";
@ -22,44 +22,44 @@ import { Invite1724579024939 } from "./migrations/1724579024939-invite";
import { Permissions1724661484664 } from "./migrations/1724661484664-permissions"; import { Permissions1724661484664 } from "./migrations/1724661484664-permissions";
import { RolePermission1724771491085 } from "./migrations/1724771491085-role_permission"; import { RolePermission1724771491085 } from "./migrations/1724771491085-role_permission";
import { MemberBaseData1725435669492 } from "./migrations/1725435669492-member_base_data"; import { MemberBaseData1725435669492 } from "./migrations/1725435669492-member_base_data";
import { member } from "./entity/member"; import { member } from "./entity/club/member/member";
import { memberAwards } from "./entity/memberAwards"; import { memberAwards } from "./entity/club/member/memberAwards";
import { memberExecutivePositions } from "./entity/memberExecutivePositions"; import { memberExecutivePositions } from "./entity/club/member/memberExecutivePositions";
import { memberQualifications } from "./entity/memberQualifications"; import { memberQualifications } from "./entity/club/member/memberQualifications";
import { membership } from "./entity/membership"; import { membership } from "./entity/club/member/membership";
import { Memberdata1726301836849 } from "./migrations/1726301836849-memberdata"; import { Memberdata1726301836849 } from "./migrations/1726301836849-memberdata";
import { CommunicationFields1727439800630 } from "./migrations/1727439800630-communicationFields"; import { CommunicationFields1727439800630 } from "./migrations/1727439800630-communicationFields";
import { Ownership1728313041449 } from "./migrations/1728313041449-ownership"; import { Ownership1728313041449 } from "./migrations/1728313041449-ownership";
import { protocol } from "./entity/protocol"; import { protocol } from "./entity/club/protocol/protocol";
import { protocolAgenda } from "./entity/protocolAgenda"; import { protocolAgenda } from "./entity/club/protocol/protocolAgenda";
import { protocolDecision } from "./entity/protocolDecision"; import { protocolDecision } from "./entity/club/protocol/protocolDecision";
import { protocolPresence } from "./entity/protocolPresence"; import { protocolPresence } from "./entity/club/protocol/protocolPresence";
import { protocolVoting } from "./entity/protocolVoting"; import { protocolVoting } from "./entity/club/protocol/protocolVoting";
import { protocolPrintout } from "./entity/protocolPrintout"; import { protocolPrintout } from "./entity/club/protocol/protocolPrintout";
import { Protocol1729347911107 } from "./migrations/1729347911107-protocol"; import { Protocol1729347911107 } from "./migrations/1729347911107-protocol";
import { calendar } from "./entity/calendar"; import { calendar } from "./entity/club/calendar";
import { calendarType } from "./entity/calendarType"; import { calendarType } from "./entity/settings/calendarType";
import { Calendar1729947763295 } from "./migrations/1729947763295-calendar"; import { Calendar1729947763295 } from "./migrations/1729947763295-calendar";
import { reset } from "./entity/reset"; import { reset } from "./entity/reset";
import { ResetToken1732358596823 } from "./migrations/1732358596823-resetToken"; import { ResetToken1732358596823 } from "./migrations/1732358596823-resetToken";
import { SMSAlarming1732696919191 } from "./migrations/1732696919191-SMSAlarming"; import { SMSAlarming1732696919191 } from "./migrations/1732696919191-SMSAlarming";
import { SecuringCalendarType1733249553766 } from "./migrations/1733249553766-securingCalendarType"; import { SecuringCalendarType1733249553766 } from "./migrations/1733249553766-securingCalendarType";
import { query } from "./entity/query"; import { query } from "./entity/settings/query";
import { QueryStore1734187754677 } from "./migrations/1734187754677-queryStore"; import { QueryStore1734187754677 } from "./migrations/1734187754677-queryStore";
import { memberView } from "./views/memberView"; import { memberView } from "./views/memberView";
import { memberExecutivePositionsView } from "./views/memberExecutivePositionView"; import { memberExecutivePositionsView } from "./views/memberExecutivePositionView";
import { memberQualificationsView } from "./views/memberQualificationsView"; import { memberQualificationsView } from "./views/memberQualificationsView";
import { membershipView } from "./views/membershipsView"; import { membershipView } from "./views/membershipsView";
import { MemberDataViews1734520998539 } from "./migrations/1734520998539-memberDataViews"; import { MemberDataViews1734520998539 } from "./migrations/1734520998539-memberDataViews";
import { template } from "./entity/template"; import { template } from "./entity/settings/template";
import { Template1734854680201 } from "./migrations/1734854680201-template"; import { Template1734854680201 } from "./migrations/1734854680201-template";
import { templateUsage } from "./entity/templateUsage"; import { templateUsage } from "./entity/settings/templateUsage";
import { TemplateUsage1734949173739 } from "./migrations/1734949173739-templateUsage"; import { TemplateUsage1734949173739 } from "./migrations/1734949173739-templateUsage";
import { newsletter } from "./entity/newsletter"; import { newsletter } from "./entity/club/newsletter/newsletter";
import { newsletterDates } from "./entity/newsletterDates"; import { newsletterDates } from "./entity/club/newsletter/newsletterDates";
import { newsletterRecipients } from "./entity/newsletterRecipients"; import { newsletterRecipients } from "./entity/club/newsletter/newsletterRecipients";
import { Newsletter1735118780511 } from "./migrations/1735118780511-newsletter"; import { Newsletter1735118780511 } from "./migrations/1735118780511-newsletter";
import { newsletterConfig } from "./entity/newsletterConfig"; import { newsletterConfig } from "./entity/settings/newsletterConfig";
import { NewsletterConfig1735207446910 } from "./migrations/1735207446910-newsletterConfig"; import { NewsletterConfig1735207446910 } from "./migrations/1735207446910-newsletterConfig";
import { TemplateMargins1735733514043 } from "./migrations/1735733514043-templateMargins"; import { TemplateMargins1735733514043 } from "./migrations/1735733514043-templateMargins";
import { InternalId1735822722235 } from "./migrations/1735822722235-internalId"; import { InternalId1735822722235 } from "./migrations/1735822722235-internalId";

8
src/demodata/member.list.data.ts
View file

@ -1,7 +1,7 @@
import { member } from "../entity/member"; import { member } from "../entity/club/member/member";
import { protocolAgenda } from "../entity/protocolAgenda"; import { protocolAgenda } from "../entity/club/protocol/protocolAgenda";
import { protocolDecision } from "../entity/protocolDecision"; import { protocolDecision } from "../entity/club/protocol/protocolDecision";
import { protocolVoting } from "../entity/protocolVoting"; import { protocolVoting } from "../entity/club/protocol/protocolVoting";
export const memberlistDemoData: { member: Array<Partial<member>> } = { export const memberlistDemoData: { member: Array<Partial<member>> } = {
member: [ member: [

4
src/demodata/newsletter.data.ts
View file

@ -1,5 +1,5 @@
import { calendar } from "../entity/calendar"; import { calendar } from "../entity/club/calendar";
import { member } from "../entity/member"; import { member } from "../entity/club/member/member";
import { Salutation } from "../enums/salutation"; import { Salutation } from "../enums/salutation";
export const newsletterDemoData: { export const newsletterDemoData: {

8
src/demodata/protocol.data.ts
View file

@ -1,7 +1,7 @@
import { member } from "../entity/member"; import { member } from "../entity/club/member/member";
import { protocolAgenda } from "../entity/protocolAgenda"; import { protocolAgenda } from "../entity/club/protocol/protocolAgenda";
import { protocolDecision } from "../entity/protocolDecision"; import { protocolDecision } from "../entity/club/protocol/protocolDecision";
import { protocolVoting } from "../entity/protocolVoting"; import { protocolVoting } from "../entity/club/protocol/protocolVoting";
export const protocolDemoData: { export const protocolDemoData: {
title: string; title: string;

2
src/entity/calendar.ts → src/entity/club/calendar.ts
View file

@ -9,7 +9,7 @@ import {
AfterUpdate, AfterUpdate,
BeforeUpdate, BeforeUpdate,
} from "typeorm"; } from "typeorm";
import { calendarType } from "./calendarType"; import { calendarType } from "../settings/calendarType";
@Entity() @Entity()
export class calendar { export class calendar {

2
src/entity/communication.ts → src/entity/club/member/communication.ts
View file

@ -1,6 +1,6 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm"; import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
import { member } from "./member"; import { member } from "./member";
import { communicationType } from "./communicationType"; import { communicationType } from "../../settings/communicationType";
@Entity() @Entity()
export class communication { export class communication {

4
src/entity/member.ts → src/entity/club/member/member.ts
View file

@ -1,11 +1,11 @@
import { Column, Entity, JoinColumn, ManyToOne, OneToMany, OneToOne, PrimaryColumn } from "typeorm"; import { Column, Entity, JoinColumn, ManyToOne, OneToMany, OneToOne, PrimaryColumn } from "typeorm";
import { Salutation } from "../enums/salutation"; import { Salutation } from "../../../enums/salutation";
import { membership } from "./membership"; import { membership } from "./membership";
import { memberAwards } from "./memberAwards"; import { memberAwards } from "./memberAwards";
import { memberQualifications } from "./memberQualifications"; import { memberQualifications } from "./memberQualifications";
import { memberExecutivePositions } from "./memberExecutivePositions"; import { memberExecutivePositions } from "./memberExecutivePositions";
import { communication } from "./communication"; import { communication } from "./communication";
import { CommunicationViewModel } from "../viewmodel/admin/communication.models"; import { CommunicationViewModel } from "../../../viewmodel/admin/club/member/communication.models";
@Entity() @Entity()
export class member { export class member {

2
src/entity/memberAwards.ts → src/entity/club/member/memberAwards.ts
View file

@ -1,6 +1,6 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm"; import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
import { member } from "./member"; import { member } from "./member";
import { award } from "./award"; import { award } from "../../settings/award";
@Entity() @Entity()
export class memberAwards { export class memberAwards {

2
src/entity/memberExecutivePositions.ts → src/entity/club/member/memberExecutivePositions.ts
View file

@ -1,6 +1,6 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm"; import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
import { member } from "./member"; import { member } from "./member";
import { executivePosition } from "./executivePosition"; import { executivePosition } from "../../settings/executivePosition";
@Entity() @Entity()
export class memberExecutivePositions { export class memberExecutivePositions {

2
src/entity/memberQualifications.ts → src/entity/club/member/memberQualifications.ts
View file

@ -1,6 +1,6 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm"; import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
import { member } from "./member"; import { member } from "./member";
import { qualification } from "./qualification"; import { qualification } from "../../settings/qualification";
@Entity() @Entity()
export class memberQualifications { export class memberQualifications {

2
src/entity/membership.ts → src/entity/club/member/membership.ts
View file

@ -1,6 +1,6 @@
import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm"; import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm";
import { member } from "./member"; import { member } from "./member";
import { membershipStatus } from "./membershipStatus"; import { membershipStatus } from "../../settings/membershipStatus";
@Entity() @Entity()
export class membership { export class membership {

4
src/entity/newsletter.ts → src/entity/club/newsletter/newsletter.ts
View file

@ -1,8 +1,8 @@
import { Column, Entity, ManyToOne, OneToMany, PrimaryColumn } from "typeorm"; import { Column, Entity, ManyToOne, OneToMany, PrimaryColumn } from "typeorm";
import { newsletterDates } from "./newsletterDates"; import { newsletterDates } from "./newsletterDates";
import { member } from "./member"; import { member } from "../member/member";
import { newsletterRecipients } from "./newsletterRecipients"; import { newsletterRecipients } from "./newsletterRecipients";
import { query } from "./query"; import { query } from "../../settings/query";
@Entity() @Entity()
export class newsletter { export class newsletter {

2
src/entity/newsletterDates.ts → src/entity/club/newsletter/newsletterDates.ts
View file

@ -1,6 +1,6 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm"; import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
import { newsletter } from "./newsletter"; import { newsletter } from "./newsletter";
import { calendar } from "./calendar"; import { calendar } from "../calendar";
@Entity() @Entity()
export class newsletterDates { export class newsletterDates {

2
src/entity/newsletterRecipients.ts → src/entity/club/newsletter/newsletterRecipients.ts
View file

@ -1,6 +1,6 @@
import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm"; import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm";
import { newsletter } from "./newsletter"; import { newsletter } from "./newsletter";
import { member } from "./member"; import { member } from "../member/member";
@Entity() @Entity()
export class newsletterRecipients { export class newsletterRecipients {

0
src/entity/protocol.ts → src/entity/club/protocol/protocol.ts
View file

0
src/entity/protocolAgenda.ts → src/entity/club/protocol/protocolAgenda.ts
View file

Some files were not shown because too many files have changed in this diff Show more