diff --git a/src/command/club/calendar/calendarCommandHandler.ts b/src/command/club/calendar/calendarCommandHandler.ts index 794736e..97fbff4 100644 --- a/src/command/club/calendar/calendarCommandHandler.ts +++ b/src/command/club/calendar/calendarCommandHandler.ts @@ -1,6 +1,6 @@ import { dataSource } from "../../../data-source"; import { calendar } from "../../../entity/club/calendar"; -import { calendarType } from "../../../entity/configuration/calendarType"; +import { calendarType } from "../../../entity/settings/calendarType"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { CreateCalendarCommand, DeleteCalendarCommand, UpdateCalendarCommand } from "./calendarCommand"; diff --git a/src/command/refreshCommandHandler.ts b/src/command/refreshCommandHandler.ts index df6a8ea..1588449 100644 --- a/src/command/refreshCommandHandler.ts +++ b/src/command/refreshCommandHandler.ts @@ -4,7 +4,7 @@ import { PWA_REFRESH_EXPIRATION, REFRESH_EXPIRATION } from "../env.defaults"; import DatabaseActionException from "../exceptions/databaseActionException"; import InternalException from "../exceptions/internalException"; import { StringHelper } from "../helpers/stringHelper"; -import UserService from "../service/management/userService"; +import UserService from "../service/user/userService"; import { CreateRefreshCommand, DeleteRefreshCommand } from "./refreshCommand"; import ms from "ms"; diff --git a/src/command/configuration/award/awardCommand.ts b/src/command/settings/award/awardCommand.ts similarity index 100% rename from src/command/configuration/award/awardCommand.ts rename to src/command/settings/award/awardCommand.ts diff --git a/src/command/configuration/award/awardCommandHandler.ts b/src/command/settings/award/awardCommandHandler.ts similarity index 96% rename from src/command/configuration/award/awardCommandHandler.ts rename to src/command/settings/award/awardCommandHandler.ts index cb9580c..bad5746 100644 --- a/src/command/configuration/award/awardCommandHandler.ts +++ b/src/command/settings/award/awardCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { award } from "../../../entity/configuration/award"; +import { award } from "../../../entity/settings/award"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { CreateAwardCommand, DeleteAwardCommand, UpdateAwardCommand } from "./awardCommand"; diff --git a/src/command/configuration/calendarType/calendarTypeCommand.ts b/src/command/settings/calendarType/calendarTypeCommand.ts similarity index 100% rename from src/command/configuration/calendarType/calendarTypeCommand.ts rename to src/command/settings/calendarType/calendarTypeCommand.ts diff --git a/src/command/configuration/calendarType/calendarTypeCommandHandler.ts b/src/command/settings/calendarType/calendarTypeCommandHandler.ts similarity index 97% rename from src/command/configuration/calendarType/calendarTypeCommandHandler.ts rename to src/command/settings/calendarType/calendarTypeCommandHandler.ts index 4a35f2b..7de554c 100644 --- a/src/command/configuration/calendarType/calendarTypeCommandHandler.ts +++ b/src/command/settings/calendarType/calendarTypeCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { calendarType } from "../../../entity/configuration/calendarType"; +import { calendarType } from "../../../entity/settings/calendarType"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { CreateCalendarTypeCommand, DeleteCalendarTypeCommand, UpdateCalendarTypeCommand } from "./calendarTypeCommand"; diff --git a/src/command/configuration/communicationType/communicationTypeCommand.ts b/src/command/settings/communicationType/communicationTypeCommand.ts similarity index 100% rename from src/command/configuration/communicationType/communicationTypeCommand.ts rename to src/command/settings/communicationType/communicationTypeCommand.ts diff --git a/src/command/configuration/communicationType/communicationTypeCommandHandler.ts b/src/command/settings/communicationType/communicationTypeCommandHandler.ts similarity index 96% rename from src/command/configuration/communicationType/communicationTypeCommandHandler.ts rename to src/command/settings/communicationType/communicationTypeCommandHandler.ts index 52f4cb6..f05b0ff 100644 --- a/src/command/configuration/communicationType/communicationTypeCommandHandler.ts +++ b/src/command/settings/communicationType/communicationTypeCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { communicationType } from "../../../entity/configuration/communicationType"; +import { communicationType } from "../../../entity/settings/communicationType"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { diff --git a/src/command/configuration/executivePosition/executivePositionCommand.ts b/src/command/settings/executivePosition/executivePositionCommand.ts similarity index 100% rename from src/command/configuration/executivePosition/executivePositionCommand.ts rename to src/command/settings/executivePosition/executivePositionCommand.ts diff --git a/src/command/configuration/executivePosition/executivePositionCommandHandler.ts b/src/command/settings/executivePosition/executivePositionCommandHandler.ts similarity index 96% rename from src/command/configuration/executivePosition/executivePositionCommandHandler.ts rename to src/command/settings/executivePosition/executivePositionCommandHandler.ts index 3c26a46..d2fb77e 100644 --- a/src/command/configuration/executivePosition/executivePositionCommandHandler.ts +++ b/src/command/settings/executivePosition/executivePositionCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { executivePosition } from "../../../entity/configuration/executivePosition"; +import { executivePosition } from "../../../entity/settings/executivePosition"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { diff --git a/src/command/configuration/membershipStatus/membershipStatusCommand.ts b/src/command/settings/membershipStatus/membershipStatusCommand.ts similarity index 100% rename from src/command/configuration/membershipStatus/membershipStatusCommand.ts rename to src/command/settings/membershipStatus/membershipStatusCommand.ts diff --git a/src/command/configuration/membershipStatus/membershipStatusCommandHandler.ts b/src/command/settings/membershipStatus/membershipStatusCommandHandler.ts similarity index 96% rename from src/command/configuration/membershipStatus/membershipStatusCommandHandler.ts rename to src/command/settings/membershipStatus/membershipStatusCommandHandler.ts index 25e25de..e1cff7f 100644 --- a/src/command/configuration/membershipStatus/membershipStatusCommandHandler.ts +++ b/src/command/settings/membershipStatus/membershipStatusCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { membershipStatus } from "../../../entity/configuration/membershipStatus"; +import { membershipStatus } from "../../../entity/settings/membershipStatus"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { diff --git a/src/command/configuration/newsletterConfig/newsletterConfigCommand.ts b/src/command/settings/newsletterConfig/newsletterConfigCommand.ts similarity index 100% rename from src/command/configuration/newsletterConfig/newsletterConfigCommand.ts rename to src/command/settings/newsletterConfig/newsletterConfigCommand.ts diff --git a/src/command/configuration/newsletterConfig/newsletterConfigCommandHandler.ts b/src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts similarity index 95% rename from src/command/configuration/newsletterConfig/newsletterConfigCommandHandler.ts rename to src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts index e9d3d2f..47fa295 100644 --- a/src/command/configuration/newsletterConfig/newsletterConfigCommandHandler.ts +++ b/src/command/settings/newsletterConfig/newsletterConfigCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { newsletterConfig } from "../../../entity/configuration/newsletterConfig"; +import { newsletterConfig } from "../../../entity/settings/newsletterConfig"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { DeleteNewsletterConfigCommand, SetNewsletterConfigCommand } from "./newsletterConfigCommand"; diff --git a/src/command/configuration/qualification/qualificationCommand.ts b/src/command/settings/qualification/qualificationCommand.ts similarity index 100% rename from src/command/configuration/qualification/qualificationCommand.ts rename to src/command/settings/qualification/qualificationCommand.ts diff --git a/src/command/configuration/qualification/qualificationCommandHandler.ts b/src/command/settings/qualification/qualificationCommandHandler.ts similarity index 96% rename from src/command/configuration/qualification/qualificationCommandHandler.ts rename to src/command/settings/qualification/qualificationCommandHandler.ts index 130775e..31480f2 100644 --- a/src/command/configuration/qualification/qualificationCommandHandler.ts +++ b/src/command/settings/qualification/qualificationCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { qualification } from "../../../entity/configuration/qualification"; +import { qualification } from "../../../entity/settings/qualification"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { diff --git a/src/command/configuration/queryStore/queryStoreCommand.ts b/src/command/settings/queryStore/queryStoreCommand.ts similarity index 100% rename from src/command/configuration/queryStore/queryStoreCommand.ts rename to src/command/settings/queryStore/queryStoreCommand.ts diff --git a/src/command/configuration/queryStore/queryStoreCommandHandler.ts b/src/command/settings/queryStore/queryStoreCommandHandler.ts similarity index 97% rename from src/command/configuration/queryStore/queryStoreCommandHandler.ts rename to src/command/settings/queryStore/queryStoreCommandHandler.ts index 7bdd227..c33cadc 100644 --- a/src/command/configuration/queryStore/queryStoreCommandHandler.ts +++ b/src/command/settings/queryStore/queryStoreCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { query } from "../../../entity/configuration/query"; +import { query } from "../../../entity/settings/query"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { CreateQueryStoreCommand, DeleteQueryStoreCommand, UpdateQueryStoreCommand } from "./queryStoreCommand"; diff --git a/src/command/configuration/salutation/salutationCommand.ts b/src/command/settings/salutation/salutationCommand.ts similarity index 100% rename from src/command/configuration/salutation/salutationCommand.ts rename to src/command/settings/salutation/salutationCommand.ts diff --git a/src/command/configuration/salutation/salutationCommandHandler.ts b/src/command/settings/salutation/salutationCommandHandler.ts similarity index 96% rename from src/command/configuration/salutation/salutationCommandHandler.ts rename to src/command/settings/salutation/salutationCommandHandler.ts index 3625ac4..70b24c2 100644 --- a/src/command/configuration/salutation/salutationCommandHandler.ts +++ b/src/command/settings/salutation/salutationCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { salutation } from "../../../entity/configuration/salutation"; +import { salutation } from "../../../entity/settings/salutation"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { CreateSalutationCommand, DeleteSalutationCommand, UpdateSalutationCommand } from "./salutationCommand"; diff --git a/src/command/configuration/template/templateCommand.ts b/src/command/settings/template/templateCommand.ts similarity index 100% rename from src/command/configuration/template/templateCommand.ts rename to src/command/settings/template/templateCommand.ts diff --git a/src/command/configuration/template/templateCommandHandler.ts b/src/command/settings/template/templateCommandHandler.ts similarity index 96% rename from src/command/configuration/template/templateCommandHandler.ts rename to src/command/settings/template/templateCommandHandler.ts index 3de378a..ebb2df7 100644 --- a/src/command/configuration/template/templateCommandHandler.ts +++ b/src/command/settings/template/templateCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { template } from "../../../entity/configuration/template"; +import { template } from "../../../entity/settings/template"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { CreateTemplateCommand, DeleteTemplateCommand, UpdateTemplateCommand } from "./templateCommand"; diff --git a/src/command/configuration/templateUsage/templateUsageCommand.ts b/src/command/settings/templateUsage/templateUsageCommand.ts similarity index 100% rename from src/command/configuration/templateUsage/templateUsageCommand.ts rename to src/command/settings/templateUsage/templateUsageCommand.ts diff --git a/src/command/configuration/templateUsage/templateUsageCommandHandler.ts b/src/command/settings/templateUsage/templateUsageCommandHandler.ts similarity index 93% rename from src/command/configuration/templateUsage/templateUsageCommandHandler.ts rename to src/command/settings/templateUsage/templateUsageCommandHandler.ts index 7134148..dc75944 100644 --- a/src/command/configuration/templateUsage/templateUsageCommandHandler.ts +++ b/src/command/settings/templateUsage/templateUsageCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { templateUsage } from "../../../entity/configuration/templateUsage"; +import { templateUsage } from "../../../entity/settings/templateUsage"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { UpdateTemplateUsageCommand } from "./templateUsageCommand"; diff --git a/src/command/management/role/roleCommand.ts b/src/command/user/role/roleCommand.ts similarity index 100% rename from src/command/management/role/roleCommand.ts rename to src/command/user/role/roleCommand.ts diff --git a/src/command/management/role/roleCommandHandler.ts b/src/command/user/role/roleCommandHandler.ts similarity index 97% rename from src/command/management/role/roleCommandHandler.ts rename to src/command/user/role/roleCommandHandler.ts index 0a12e1f..40f9a8f 100644 --- a/src/command/management/role/roleCommandHandler.ts +++ b/src/command/user/role/roleCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { role } from "../../../entity/management/role"; +import { role } from "../../../entity/user/role"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "./roleCommand"; diff --git a/src/command/management/role/rolePermissionCommand.ts b/src/command/user/role/rolePermissionCommand.ts similarity index 100% rename from src/command/management/role/rolePermissionCommand.ts rename to src/command/user/role/rolePermissionCommand.ts diff --git a/src/command/management/role/rolePermissionCommandHandler.ts b/src/command/user/role/rolePermissionCommandHandler.ts similarity index 91% rename from src/command/management/role/rolePermissionCommandHandler.ts rename to src/command/user/role/rolePermissionCommandHandler.ts index 8a9230e..21a98d4 100644 --- a/src/command/management/role/rolePermissionCommandHandler.ts +++ b/src/command/user/role/rolePermissionCommandHandler.ts @@ -1,15 +1,15 @@ import { DeleteResult, EntityManager, InsertResult } from "typeorm"; import { dataSource } from "../../../data-source"; -import { rolePermission } from "../../../entity/management/role_permission"; +import { rolePermission } from "../../../entity/user/role_permission"; import InternalException from "../../../exceptions/internalException"; -import RoleService from "../../../service/management/roleService"; +import RoleService from "../../../service/user/roleService"; import { CreateRolePermissionCommand, DeleteRolePermissionCommand, UpdateRolePermissionsCommand, } from "./rolePermissionCommand"; import PermissionHelper from "../../../helpers/permissionHelper"; -import RolePermissionService from "../../../service/management/rolePermissionService"; +import RolePermissionService from "../../../service/user/rolePermissionService"; import { PermissionString } from "../../../type/permissionTypes"; import DatabaseActionException from "../../../exceptions/databaseActionException"; diff --git a/src/command/management/user/inviteCommand.ts b/src/command/user/user/inviteCommand.ts similarity index 100% rename from src/command/management/user/inviteCommand.ts rename to src/command/user/user/inviteCommand.ts diff --git a/src/command/management/user/inviteCommandHandler.ts b/src/command/user/user/inviteCommandHandler.ts similarity index 97% rename from src/command/management/user/inviteCommandHandler.ts rename to src/command/user/user/inviteCommandHandler.ts index 5c01044..fd760d4 100644 --- a/src/command/management/user/inviteCommandHandler.ts +++ b/src/command/user/user/inviteCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { invite } from "../../../entity/management/invite"; +import { invite } from "../../../entity/user/invite"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { StringHelper } from "../../../helpers/stringHelper"; diff --git a/src/command/management/user/userCommand.ts b/src/command/user/user/userCommand.ts similarity index 100% rename from src/command/management/user/userCommand.ts rename to src/command/user/user/userCommand.ts diff --git a/src/command/management/user/userCommandHandler.ts b/src/command/user/user/userCommandHandler.ts similarity index 97% rename from src/command/management/user/userCommandHandler.ts rename to src/command/user/user/userCommandHandler.ts index 590b2de..0f1102a 100644 --- a/src/command/management/user/userCommandHandler.ts +++ b/src/command/user/user/userCommandHandler.ts @@ -1,6 +1,6 @@ import { EntityManager } from "typeorm"; import { dataSource } from "../../../data-source"; -import { user } from "../../../entity/management/user"; +import { user } from "../../../entity/user/user"; import InternalException from "../../../exceptions/internalException"; import { CreateUserCommand, @@ -10,7 +10,7 @@ import { UpdateUserRolesCommand, UpdateUserSecretCommand, } from "./userCommand"; -import UserService from "../../../service/management/userService"; +import UserService from "../../../service/user/userService"; import DatabaseActionException from "../../../exceptions/databaseActionException"; export default abstract class UserCommandHandler { diff --git a/src/command/management/user/userPermissionCommand.ts b/src/command/user/user/userPermissionCommand.ts similarity index 100% rename from src/command/management/user/userPermissionCommand.ts rename to src/command/user/user/userPermissionCommand.ts diff --git a/src/command/management/user/userPermissionCommandHandler.ts b/src/command/user/user/userPermissionCommandHandler.ts similarity index 92% rename from src/command/management/user/userPermissionCommandHandler.ts rename to src/command/user/user/userPermissionCommandHandler.ts index 337f68a..77694f3 100644 --- a/src/command/management/user/userPermissionCommandHandler.ts +++ b/src/command/user/user/userPermissionCommandHandler.ts @@ -1,14 +1,14 @@ import { DeleteResult, EntityManager, InsertResult } from "typeorm"; import { dataSource } from "../../../data-source"; -import { user } from "../../../entity/management/user"; -import { userPermission } from "../../../entity/management/user_permission"; +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/management/userPermissionService"; +import UserPermissionService from "../../../service/user/userPermissionService"; import PermissionHelper from "../../../helpers/permissionHelper"; import { PermissionString } from "../../../type/permissionTypes"; import DatabaseActionException from "../../../exceptions/databaseActionException"; diff --git a/src/command/management/webapi/webapiCommand.ts b/src/command/user/webapi/webapiCommand.ts similarity index 100% rename from src/command/management/webapi/webapiCommand.ts rename to src/command/user/webapi/webapiCommand.ts diff --git a/src/command/management/webapi/webapiCommandHandler.ts b/src/command/user/webapi/webapiCommandHandler.ts similarity index 97% rename from src/command/management/webapi/webapiCommandHandler.ts rename to src/command/user/webapi/webapiCommandHandler.ts index 8a3b864..ea12d98 100644 --- a/src/command/management/webapi/webapiCommandHandler.ts +++ b/src/command/user/webapi/webapiCommandHandler.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../../data-source"; -import { webapi } from "../../../entity/management/webapi"; +import { webapi } from "../../../entity/user/webapi"; import DatabaseActionException from "../../../exceptions/databaseActionException"; import InternalException from "../../../exceptions/internalException"; import { diff --git a/src/command/management/webapi/webapiPermissionCommand.ts b/src/command/user/webapi/webapiPermissionCommand.ts similarity index 100% rename from src/command/management/webapi/webapiPermissionCommand.ts rename to src/command/user/webapi/webapiPermissionCommand.ts diff --git a/src/command/management/webapi/webapiPermissionCommandHandler.ts b/src/command/user/webapi/webapiPermissionCommandHandler.ts similarity index 91% rename from src/command/management/webapi/webapiPermissionCommandHandler.ts rename to src/command/user/webapi/webapiPermissionCommandHandler.ts index 57e27fb..ec661f4 100644 --- a/src/command/management/webapi/webapiPermissionCommandHandler.ts +++ b/src/command/user/webapi/webapiPermissionCommandHandler.ts @@ -1,15 +1,15 @@ import { DeleteResult, EntityManager, InsertResult } from "typeorm"; import { dataSource } from "../../../data-source"; -import { webapiPermission } from "../../../entity/management/webapi_permission"; +import { webapiPermission } from "../../../entity/user/webapi_permission"; import InternalException from "../../../exceptions/internalException"; -import WebapiService from "../../../service/management/webapiService"; +import WebapiService from "../../../service/user/webapiService"; import { CreateWebapiPermissionCommand, DeleteWebapiPermissionCommand, UpdateWebapiPermissionsCommand, } from "./webapiPermissionCommand"; import PermissionHelper from "../../../helpers/permissionHelper"; -import WebapiPermissionService from "../../../service/management/webapiPermissionService"; +import WebapiPermissionService from "../../../service/user/webapiPermissionService"; import { PermissionString } from "../../../type/permissionTypes"; import DatabaseActionException from "../../../exceptions/databaseActionException"; diff --git a/src/controller/admin/club/calendarController.ts b/src/controller/admin/club/calendarController.ts index 81a50d1..fcb5ddb 100644 --- a/src/controller/admin/club/calendarController.ts +++ b/src/controller/admin/club/calendarController.ts @@ -1,20 +1,16 @@ import { Request, Response } from "express"; import CalendarService from "../../../service/club/calendarService"; import CalendarFactory from "../../../factory/admin/club/calendar"; -import CalendarTypeService from "../../../service/configuration/calendarTypeService"; -import CalendarTypeFactory from "../../../factory/admin/configuration/calendarType"; -import { - CreateCalendarCommand, - DeleteCalendarCommand, - UpdateCalendarCommand, -} from "../../../command/club/calendar/calendarCommand"; +import CalendarTypeService from "../../../service/settings/calendarTypeService"; +import CalendarTypeFactory from "../../../factory/admin/settings/calendarType"; +import { CreateCalendarCommand, DeleteCalendarCommand, UpdateCalendarCommand } from "../../../command/club/calendar/calendarCommand"; import CalendarCommandHandler from "../../../command/club/calendar/calendarCommandHandler"; import { CreateCalendarTypeCommand, DeleteCalendarTypeCommand, UpdateCalendarTypeCommand, -} from "../../../command/configuration/calendarType/calendarTypeCommand"; -import CalendarTypeCommandHandler from "../../../command/configuration/calendarType/calendarTypeCommandHandler"; +} from "../../../command/settings/calendarType/calendarTypeCommand"; +import CalendarTypeCommandHandler from "../../../command/settings/calendarType/calendarTypeCommandHandler"; /** * @description get all calendar items diff --git a/src/controller/admin/club/newsletterController.ts b/src/controller/admin/club/newsletterController.ts index 68854c9..eeb25e6 100644 --- a/src/controller/admin/club/newsletterController.ts +++ b/src/controller/admin/club/newsletterController.ts @@ -17,7 +17,7 @@ import { SynchronizeNewsletterRecipientsCommand } from "../../../command/club/ne import NewsletterRecipientsCommandHandler from "../../../command/club/newsletter/newsletterRecipientsCommandHandler"; import { NewsletterDatesViewModel } from "../../../viewmodel/admin/club/newsletter/newsletterDates.models"; import { PdfExport } from "../../../helpers/pdfExport"; -import UserService from "../../../service/management/userService"; +import UserService from "../../../service/user/userService"; import { TemplateHelper } from "../../../helpers/templateHelper"; import MailHelper from "../../../helpers/mailHelper"; import { NewsletterEventType, NewsletterHelper } from "../../../helpers/newsletterHelper"; diff --git a/src/controller/admin/configuration/awardController.ts b/src/controller/admin/settings/awardController.ts similarity index 84% rename from src/controller/admin/configuration/awardController.ts rename to src/controller/admin/settings/awardController.ts index b8597ec..a87b1c3 100644 --- a/src/controller/admin/configuration/awardController.ts +++ b/src/controller/admin/settings/awardController.ts @@ -1,12 +1,8 @@ import { Request, Response } from "express"; -import AwardService from "../../../service/configuration/awardService"; -import AwardFactory from "../../../factory/admin/configuration/award"; -import { - CreateAwardCommand, - DeleteAwardCommand, - UpdateAwardCommand, -} from "../../../command/configuration/award/awardCommand"; -import AwardCommandHandler from "../../../command/configuration/award/awardCommandHandler"; +import AwardService from "../../../service/settings/awardService"; +import AwardFactory from "../../../factory/admin/settings/award"; +import { CreateAwardCommand, DeleteAwardCommand, UpdateAwardCommand } from "../../../command/settings/award/awardCommand"; +import AwardCommandHandler from "../../../command/settings/award/awardCommandHandler"; /** * @description get all awards diff --git a/src/controller/admin/configuration/communicationTypeController.ts b/src/controller/admin/settings/communicationTypeController.ts similarity index 88% rename from src/controller/admin/configuration/communicationTypeController.ts rename to src/controller/admin/settings/communicationTypeController.ts index d3aae1b..ad46b03 100644 --- a/src/controller/admin/configuration/communicationTypeController.ts +++ b/src/controller/admin/settings/communicationTypeController.ts @@ -1,13 +1,13 @@ import { Request, Response } from "express"; -import CommunicationTypeService from "../../../service/configuration/communicationTypeService"; -import CommunicationTypeFactory from "../../../factory/admin/configuration/communicationType"; +import CommunicationTypeService from "../../../service/settings/communicationTypeService"; +import CommunicationTypeFactory from "../../../factory/admin/settings/communicationType"; import CommunicationService from "../../../service/club/member/communicationService"; import { CreateCommunicationTypeCommand, DeleteCommunicationTypeCommand, UpdateCommunicationTypeCommand, -} from "../../../command/configuration/communicationType/communicationTypeCommand"; -import CommunicationTypeCommandHandler from "../../../command/configuration/communicationType/communicationTypeCommandHandler"; +} from "../../../command/settings/communicationType/communicationTypeCommand"; +import CommunicationTypeCommandHandler from "../../../command/settings/communicationType/communicationTypeCommandHandler"; /** * @description get all communicationTypes diff --git a/src/controller/admin/configuration/executivePositionController.ts b/src/controller/admin/settings/executivePositionController.ts similarity index 86% rename from src/controller/admin/configuration/executivePositionController.ts rename to src/controller/admin/settings/executivePositionController.ts index 2e72ae6..15437ef 100644 --- a/src/controller/admin/configuration/executivePositionController.ts +++ b/src/controller/admin/settings/executivePositionController.ts @@ -1,12 +1,12 @@ import { Request, Response } from "express"; -import ExecutivePositionService from "../../../service/configuration/executivePositionService"; -import ExecutivePositionFactory from "../../../factory/admin/configuration/executivePosition"; +import ExecutivePositionService from "../../../service/settings/executivePositionService"; +import ExecutivePositionFactory from "../../../factory/admin/settings/executivePosition"; import { CreateExecutivePositionCommand, DeleteExecutivePositionCommand, UpdateExecutivePositionCommand, -} from "../../../command/configuration/executivePosition/executivePositionCommand"; -import ExecutivePositionCommandHandler from "../../../command/configuration/executivePosition/executivePositionCommandHandler"; +} from "../../../command/settings/executivePosition/executivePositionCommand"; +import ExecutivePositionCommandHandler from "../../../command/settings/executivePosition/executivePositionCommandHandler"; /** * @description get all executivePositions diff --git a/src/controller/admin/configuration/membershipStatusController.ts b/src/controller/admin/settings/membershipStatusController.ts similarity index 86% rename from src/controller/admin/configuration/membershipStatusController.ts rename to src/controller/admin/settings/membershipStatusController.ts index 2b620e7..9c5fa23 100644 --- a/src/controller/admin/configuration/membershipStatusController.ts +++ b/src/controller/admin/settings/membershipStatusController.ts @@ -1,12 +1,12 @@ import { Request, Response } from "express"; -import MembershipStatusService from "../../../service/configuration/membershipStatusService"; -import MembershipStatusFactory from "../../../factory/admin/configuration/membershipStatus"; +import MembershipStatusService from "../../../service/settings/membershipStatusService"; +import MembershipStatusFactory from "../../../factory/admin/settings/membershipStatus"; import { CreateMembershipStatusCommand, DeleteMembershipStatusCommand, UpdateMembershipStatusCommand, -} from "../../../command/configuration/membershipStatus/membershipStatusCommand"; -import MembershipStatusCommandHandler from "../../../command/configuration/membershipStatus/membershipStatusCommandHandler"; +} from "../../../command/settings/membershipStatus/membershipStatusCommand"; +import MembershipStatusCommandHandler from "../../../command/settings/membershipStatus/membershipStatusCommandHandler"; /** * @description get all membershipStatus diff --git a/src/controller/admin/configuration/newsletterConfigController.ts b/src/controller/admin/settings/newsletterConfigController.ts similarity index 83% rename from src/controller/admin/configuration/newsletterConfigController.ts rename to src/controller/admin/settings/newsletterConfigController.ts index 2227bee..c476c54 100644 --- a/src/controller/admin/configuration/newsletterConfigController.ts +++ b/src/controller/admin/settings/newsletterConfigController.ts @@ -1,11 +1,11 @@ import { Request, Response } from "express"; -import NewsletterConfigService from "../../../service/configuration/newsletterConfigService"; -import NewsletterConfigFactory from "../../../factory/admin/configuration/newsletterConfig"; -import NewsletterConfigCommandHandler from "../../../command/configuration/newsletterConfig/newsletterConfigCommandHandler"; +import NewsletterConfigService from "../../../service/settings/newsletterConfigService"; +import NewsletterConfigFactory from "../../../factory/admin/settings/newsletterConfig"; +import NewsletterConfigCommandHandler from "../../../command/settings/newsletterConfig/newsletterConfigCommandHandler"; import { DeleteNewsletterConfigCommand, SetNewsletterConfigCommand, -} from "../../../command/configuration/newsletterConfig/newsletterConfigCommand"; +} from "../../../command/settings/newsletterConfig/newsletterConfigCommand"; /** * @description get all newsletterConfigs diff --git a/src/controller/admin/configuration/qualificationController.ts b/src/controller/admin/settings/qualificationController.ts similarity index 87% rename from src/controller/admin/configuration/qualificationController.ts rename to src/controller/admin/settings/qualificationController.ts index e9102eb..75c9b15 100644 --- a/src/controller/admin/configuration/qualificationController.ts +++ b/src/controller/admin/settings/qualificationController.ts @@ -1,12 +1,12 @@ import { Request, Response } from "express"; -import QualificationService from "../../../service/configuration/qualification"; -import QualificationFactory from "../../../factory/admin/configuration/qualification"; +import QualificationService from "../../../service/settings/qualification"; +import QualificationFactory from "../../../factory/admin/settings/qualification"; import { CreateQualificationCommand, DeleteQualificationCommand, UpdateQualificationCommand, -} from "../../../command/configuration/qualification/qualificationCommand"; -import QualificationCommandHandler from "../../../command/configuration/qualification/qualificationCommandHandler"; +} from "../../../command/settings/qualification/qualificationCommand"; +import QualificationCommandHandler from "../../../command/settings/qualification/qualificationCommandHandler"; /** * @description get all qualifications diff --git a/src/controller/admin/configuration/queryStoreController.ts b/src/controller/admin/settings/queryStoreController.ts similarity index 87% rename from src/controller/admin/configuration/queryStoreController.ts rename to src/controller/admin/settings/queryStoreController.ts index f963f8d..397b898 100644 --- a/src/controller/admin/configuration/queryStoreController.ts +++ b/src/controller/admin/settings/queryStoreController.ts @@ -1,12 +1,12 @@ import { Request, Response } from "express"; -import QueryStoreFactory from "../../../factory/admin/configuration/queryStore"; -import QueryStoreService from "../../../service/configuration/queryStoreService"; +import QueryStoreFactory from "../../../factory/admin/settings/queryStore"; +import QueryStoreService from "../../../service/settings/queryStoreService"; import { CreateQueryStoreCommand, DeleteQueryStoreCommand, UpdateQueryStoreCommand, -} from "../../../command/configuration/queryStore/queryStoreCommand"; -import QueryStoreCommandHandler from "../../../command/configuration/queryStore/queryStoreCommandHandler"; +} from "../../../command/settings/queryStore/queryStoreCommand"; +import QueryStoreCommandHandler from "../../../command/settings/queryStore/queryStoreCommandHandler"; /** * @description get all queryStores diff --git a/src/controller/admin/configuration/salutationController.ts b/src/controller/admin/settings/salutationController.ts similarity index 86% rename from src/controller/admin/configuration/salutationController.ts rename to src/controller/admin/settings/salutationController.ts index 732e8cf..d27f4e4 100644 --- a/src/controller/admin/configuration/salutationController.ts +++ b/src/controller/admin/settings/salutationController.ts @@ -1,12 +1,12 @@ import { Request, Response } from "express"; -import SalutationService from "../../../service/configuration/salutationService"; -import SalutationFactory from "../../../factory/admin/configuration/salutation"; +import SalutationService from "../../../service/settings/salutationService"; +import SalutationFactory from "../../../factory/admin/settings/salutation"; import { CreateSalutationCommand, DeleteSalutationCommand, UpdateSalutationCommand, -} from "../../../command/configuration/salutation/salutationCommand"; -import SalutationCommandHandler from "../../../command/configuration/salutation/salutationCommandHandler"; +} from "../../../command/settings/salutation/salutationCommand"; +import SalutationCommandHandler from "../../../command/settings/salutation/salutationCommandHandler"; /** * @description get all salutations diff --git a/src/controller/admin/configuration/templateController.ts b/src/controller/admin/settings/templateController.ts similarity index 88% rename from src/controller/admin/configuration/templateController.ts rename to src/controller/admin/settings/templateController.ts index 012cccb..eb9d31e 100644 --- a/src/controller/admin/configuration/templateController.ts +++ b/src/controller/admin/settings/templateController.ts @@ -1,12 +1,8 @@ import { Request, Response } from "express"; -import TemplateService from "../../../service/configuration/templateService"; -import TemplateFactory from "../../../factory/admin/configuration/template"; -import { - CreateTemplateCommand, - DeleteTemplateCommand, - UpdateTemplateCommand, -} from "../../../command/configuration/template/templateCommand"; -import TemplateCommandHandler from "../../../command/configuration/template/templateCommandHandler"; +import TemplateService from "../../../service/settings/templateService"; +import TemplateFactory from "../../../factory/admin/settings/template"; +import { CreateTemplateCommand, DeleteTemplateCommand, UpdateTemplateCommand } from "../../../command/settings/template/templateCommand"; +import TemplateCommandHandler from "../../../command/settings/template/templateCommandHandler"; /** * @description get all templates diff --git a/src/controller/admin/configuration/templateUsageController.ts b/src/controller/admin/settings/templateUsageController.ts similarity index 84% rename from src/controller/admin/configuration/templateUsageController.ts rename to src/controller/admin/settings/templateUsageController.ts index e34f49e..eb8b71f 100644 --- a/src/controller/admin/configuration/templateUsageController.ts +++ b/src/controller/admin/settings/templateUsageController.ts @@ -1,8 +1,8 @@ import { Request, Response } from "express"; -import TemplateUsageService from "../../../service/configuration/templateUsageService"; -import TemplateUsageFactory from "../../../factory/admin/configuration/templateUsage"; -import { UpdateTemplateUsageCommand } from "../../../command/configuration/templateUsage/templateUsageCommand"; -import TemplateUsageCommandHandler from "../../../command/configuration/templateUsage/templateUsageCommandHandler"; +import TemplateUsageService from "../../../service/settings/templateUsageService"; +import TemplateUsageFactory from "../../../factory/admin/settings/templateUsage"; +import { UpdateTemplateUsageCommand } from "../../../command/settings/templateUsage/templateUsageCommand"; +import TemplateUsageCommandHandler from "../../../command/settings/templateUsage/templateUsageCommandHandler"; import PermissionHelper from "../../../helpers/permissionHelper"; import ForbiddenRequestException from "../../../exceptions/forbiddenRequestException"; import { PermissionModule } from "../../../type/permissionTypes"; @@ -21,7 +21,7 @@ export async function getAllTemplateUsages(req: Request, res: Response): Promise if (!req.isOwner) { templateUsages = templateUsages.filter((tu) => { return ( - PermissionHelper.can(req.permissions, "update", "configuration", tu.scope.split(".")[0] as PermissionModule) || + PermissionHelper.can(req.permissions, "update", "settings", tu.scope.split(".")[0] as PermissionModule) || PermissionHelper.can(req.permissions, "update", "club", tu.scope.split(".")[0] as PermissionModule) ); }); @@ -66,7 +66,7 @@ export async function updateTemplateUsage(req: Request, res: Response): Promise< let allowedSettings = PermissionHelper.can( req.permissions, "update", - "configuration", + "settings", req.params.scope as PermissionModule ); let allowedClub = PermissionHelper.can(req.permissions, "update", "club", req.params.scope as PermissionModule); diff --git a/src/controller/admin/management/backupController.ts b/src/controller/admin/user/backupController.ts similarity index 100% rename from src/controller/admin/management/backupController.ts rename to src/controller/admin/user/backupController.ts diff --git a/src/controller/admin/management/roleController.ts b/src/controller/admin/user/roleController.ts similarity index 84% rename from src/controller/admin/management/roleController.ts rename to src/controller/admin/user/roleController.ts index 3af6ec8..f482b63 100644 --- a/src/controller/admin/management/roleController.ts +++ b/src/controller/admin/user/roleController.ts @@ -1,12 +1,12 @@ import { Request, Response } from "express"; -import RoleService from "../../../service/management/roleService"; -import RoleFactory from "../../../factory/admin/management/role"; -import RolePermissionService from "../../../service/management/rolePermissionService"; +import RoleService from "../../../service/user/roleService"; +import RoleFactory from "../../../factory/admin/user/role"; +import RolePermissionService from "../../../service/user/rolePermissionService"; import PermissionHelper from "../../../helpers/permissionHelper"; -import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "../../../command/management/role/roleCommand"; -import RoleCommandHandler from "../../../command/management/role/roleCommandHandler"; -import { UpdateRolePermissionsCommand } from "../../../command/management/role/rolePermissionCommand"; -import RolePermissionCommandHandler from "../../../command/management/role/rolePermissionCommandHandler"; +import { CreateRoleCommand, DeleteRoleCommand, UpdateRoleCommand } from "../../../command/user/role/roleCommand"; +import RoleCommandHandler from "../../../command/user/role/roleCommandHandler"; +import { UpdateRolePermissionsCommand } from "../../../command/user/role/rolePermissionCommand"; +import RolePermissionCommandHandler from "../../../command/user/role/rolePermissionCommandHandler"; /** * @description get All roles diff --git a/src/controller/admin/management/userController.ts b/src/controller/admin/user/userController.ts similarity index 85% rename from src/controller/admin/management/userController.ts rename to src/controller/admin/user/userController.ts index ba2a134..58d815e 100644 --- a/src/controller/admin/management/userController.ts +++ b/src/controller/admin/user/userController.ts @@ -1,19 +1,15 @@ import { Request, Response } from "express"; -import UserService from "../../../service/management/userService"; -import UserFactory from "../../../factory/admin/management/user"; -import UserPermissionService from "../../../service/management/userPermissionService"; +import UserService from "../../../service/user/userService"; +import UserFactory from "../../../factory/admin/user/user"; +import UserPermissionService from "../../../service/user/userPermissionService"; import PermissionHelper from "../../../helpers/permissionHelper"; -import RoleFactory from "../../../factory/admin/management/role"; -import { - DeleteUserCommand, - UpdateUserCommand, - UpdateUserRolesCommand, -} from "../../../command/management/user/userCommand"; -import UserCommandHandler from "../../../command/management/user/userCommandHandler"; +import RoleFactory from "../../../factory/admin/user/role"; +import { DeleteUserCommand, UpdateUserCommand, UpdateUserRolesCommand } from "../../../command/user/user/userCommand"; +import UserCommandHandler from "../../../command/user/user/userCommandHandler"; import MailHelper from "../../../helpers/mailHelper"; import { CLUB_NAME } from "../../../env.defaults"; -import { UpdateUserPermissionsCommand } from "../../../command/management/user/userPermissionCommand"; -import UserPermissionCommandHandler from "../../../command/management/user/userPermissionCommandHandler"; +import { UpdateUserPermissionsCommand } from "../../../command/user/user/userPermissionCommand"; +import UserPermissionCommandHandler from "../../../command/user/user/userPermissionCommandHandler"; import BadRequestException from "../../../exceptions/badRequestException"; /** diff --git a/src/controller/admin/management/webapiController.ts b/src/controller/admin/user/webapiController.ts similarity index 88% rename from src/controller/admin/management/webapiController.ts rename to src/controller/admin/user/webapiController.ts index 80df60a..d5390ff 100644 --- a/src/controller/admin/management/webapiController.ts +++ b/src/controller/admin/user/webapiController.ts @@ -1,16 +1,16 @@ import { Request, Response } from "express"; -import WebapiService from "../../../service/management/webapiService"; -import ApiFactory from "../../../factory/admin/management/webapi"; -import WebapiPermissionService from "../../../service/management/webapiPermissionService"; +import WebapiService from "../../../service/user/webapiService"; +import ApiFactory from "../../../factory/admin/user/webapi"; +import WebapiPermissionService from "../../../service/user/webapiPermissionService"; import PermissionHelper from "../../../helpers/permissionHelper"; import { CreateWebapiCommand, DeleteWebapiCommand, UpdateWebapiCommand, -} from "../../../command/management/webapi/webapiCommand"; -import WebapiCommandHandler from "../../../command/management/webapi/webapiCommandHandler"; -import { UpdateWebapiPermissionsCommand } from "../../../command/management/webapi/webapiPermissionCommand"; -import WebapiPermissionCommandHandler from "../../../command/management/webapi/webapiPermissionCommandHandler"; +} from "../../../command/user/webapi/webapiCommand"; +import WebapiCommandHandler from "../../../command/user/webapi/webapiCommandHandler"; +import { UpdateWebapiPermissionsCommand } from "../../../command/user/webapi/webapiPermissionCommand"; +import WebapiPermissionCommandHandler from "../../../command/user/webapi/webapiPermissionCommandHandler"; import { JWTHelper } from "../../../helpers/jwtHelper"; import { CLUB_NAME } from "../../../env.defaults"; import { StringHelper } from "../../../helpers/stringHelper"; diff --git a/src/controller/authController.ts b/src/controller/authController.ts index 9ecfa64..e3f5af2 100644 --- a/src/controller/authController.ts +++ b/src/controller/authController.ts @@ -4,7 +4,7 @@ import { JWTToken } from "../type/jwtTypes"; import InternalException from "../exceptions/internalException"; import RefreshCommandHandler from "../command/refreshCommandHandler"; import { CreateRefreshCommand, DeleteRefreshCommand } from "../command/refreshCommand"; -import UserService from "../service/management/userService"; +import UserService from "../service/user/userService"; import speakeasy from "speakeasy"; import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException"; import RefreshService from "../service/refreshService"; diff --git a/src/controller/inviteController.ts b/src/controller/inviteController.ts index e5d2df9..544aa14 100644 --- a/src/controller/inviteController.ts +++ b/src/controller/inviteController.ts @@ -7,18 +7,18 @@ import { CreateRefreshCommand } from "../command/refreshCommand"; import speakeasy from "speakeasy"; import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException"; import QRCode from "qrcode"; -import { CreateUserCommand } from "../command/management/user/userCommand"; -import UserCommandHandler from "../command/management/user/userCommandHandler"; -import { CreateInviteCommand, DeleteInviteCommand } from "../command/management/user/inviteCommand"; -import InviteCommandHandler from "../command/management/user/inviteCommandHandler"; +import { CreateUserCommand } from "../command/user/user/userCommand"; +import UserCommandHandler from "../command/user/user/userCommandHandler"; +import { CreateInviteCommand, DeleteInviteCommand } from "../command/user/user/inviteCommand"; +import InviteCommandHandler from "../command/user/user/inviteCommandHandler"; import MailHelper from "../helpers/mailHelper"; -import InviteService from "../service/management/inviteService"; -import UserService from "../service/management/userService"; +import InviteService from "../service/user/inviteService"; +import UserService from "../service/user/userService"; import CustomRequestException from "../exceptions/customRequestException"; import { CLUB_NAME } from "../env.defaults"; -import { CreateUserPermissionCommand } from "../command/management/user/userPermissionCommand"; -import UserPermissionCommandHandler from "../command/management/user/userPermissionCommandHandler"; -import InviteFactory from "../factory/admin/management/invite"; +import { CreateUserPermissionCommand } from "../command/user/user/userPermissionCommand"; +import UserPermissionCommandHandler from "../command/user/user/userPermissionCommandHandler"; +import InviteFactory from "../factory/admin/user/invite"; /** * @description get all invites diff --git a/src/controller/publicController.ts b/src/controller/publicController.ts index f44100d..b3bf2b0 100644 --- a/src/controller/publicController.ts +++ b/src/controller/publicController.ts @@ -1,6 +1,6 @@ import { Request, Response } from "express"; import CalendarService from "../service/club/calendarService"; -import CalendarTypeService from "../service/configuration/calendarTypeService"; +import CalendarTypeService from "../service/settings/calendarTypeService"; import { calendar } from "../entity/club/calendar"; import { createEvents } from "ics"; import moment from "moment"; diff --git a/src/controller/resetController.ts b/src/controller/resetController.ts index 70561ec..eec65b4 100644 --- a/src/controller/resetController.ts +++ b/src/controller/resetController.ts @@ -11,13 +11,13 @@ import { CreateResetCommand, DeleteResetCommand } from "../command/resetCommand" import ResetCommandHandler from "../command/resetCommandHandler"; import MailHelper from "../helpers/mailHelper"; import ResetService from "../service/resetService"; -import UserService from "../service/management/userService"; +import UserService from "../service/user/userService"; import { CLUB_NAME } from "../env.defaults"; import PermissionHelper from "../helpers/permissionHelper"; -import RolePermissionService from "../service/management/rolePermissionService"; -import UserPermissionService from "../service/management/userPermissionService"; -import { UpdateUserSecretCommand } from "../command/management/user/userCommand"; -import UserCommandHandler from "../command/management/user/userCommandHandler"; +import RolePermissionService from "../service/user/rolePermissionService"; +import UserPermissionService from "../service/user/userPermissionService"; +import { UpdateUserSecretCommand } from "../command/user/user/userCommand"; +import UserCommandHandler from "../command/user/user/userCommandHandler"; /** * @description request totp reset diff --git a/src/controller/userController.ts b/src/controller/userController.ts index c084ec5..fb5b874 100644 --- a/src/controller/userController.ts +++ b/src/controller/userController.ts @@ -3,10 +3,10 @@ import speakeasy from "speakeasy"; import QRCode from "qrcode"; import InternalException from "../exceptions/internalException"; import { CLUB_NAME } from "../env.defaults"; -import UserService from "../service/management/userService"; -import UserFactory from "../factory/admin/management/user"; -import { TransferUserOwnerCommand, UpdateUserCommand } from "../command/management/user/userCommand"; -import UserCommandHandler from "../command/management/user/userCommandHandler"; +import UserService from "../service/user/userService"; +import UserFactory from "../factory/admin/user/user"; +import { TransferUserOwnerCommand, UpdateUserCommand } from "../command/user/user/userCommand"; +import UserCommandHandler from "../command/user/user/userCommandHandler"; import ForbiddenRequestException from "../exceptions/forbiddenRequestException"; /** diff --git a/src/controller/webapiController.ts b/src/controller/webapiController.ts index e8e4206..7af86dd 100644 --- a/src/controller/webapiController.ts +++ b/src/controller/webapiController.ts @@ -4,13 +4,13 @@ import { JWTToken } from "../type/jwtTypes"; import InternalException from "../exceptions/internalException"; import RefreshCommandHandler from "../command/refreshCommandHandler"; import { CreateRefreshCommand, DeleteRefreshCommand } from "../command/refreshCommand"; -import UserService from "../service/management/userService"; +import UserService from "../service/user/userService"; import speakeasy from "speakeasy"; import UnauthorizedRequestException from "../exceptions/unauthorizedRequestException"; import RefreshService from "../service/refreshService"; -import WebapiService from "../service/management/webapiService"; +import WebapiService from "../service/user/webapiService"; import ForbiddenRequestException from "../exceptions/forbiddenRequestException"; -import WebapiCommandHandler from "../command/management/webapi/webapiCommandHandler"; +import WebapiCommandHandler from "../command/user/webapi/webapiCommandHandler"; /** * @description Check authentication status by token diff --git a/src/data-source.ts b/src/data-source.ts index 6babcb1..e775503 100644 --- a/src/data-source.ts +++ b/src/data-source.ts @@ -3,18 +3,18 @@ import "reflect-metadata"; import { DataSource } from "typeorm"; import { DB_HOST, DB_USERNAME, DB_PASSWORD, DB_NAME, DB_TYPE, DB_PORT } from "./env.defaults"; -import { user } from "./entity/management/user"; +import { user } from "./entity/user/user"; import { refresh } from "./entity/refresh"; -import { invite } from "./entity/management/invite"; -import { userPermission } from "./entity/management/user_permission"; -import { role } from "./entity/management/role"; -import { rolePermission } from "./entity/management/role_permission"; -import { award } from "./entity/configuration/award"; +import { invite } from "./entity/user/invite"; +import { userPermission } from "./entity/user/user_permission"; +import { role } from "./entity/user/role"; +import { rolePermission } from "./entity/user/role_permission"; +import { award } from "./entity/settings/award"; import { communication } from "./entity/club/member/communication"; -import { communicationType } from "./entity/configuration/communicationType"; -import { executivePosition } from "./entity/configuration/executivePosition"; -import { membershipStatus } from "./entity/configuration/membershipStatus"; -import { qualification } from "./entity/configuration/qualification"; +import { communicationType } from "./entity/settings/communicationType"; +import { executivePosition } from "./entity/settings/executivePosition"; +import { membershipStatus } from "./entity/settings/membershipStatus"; +import { qualification } from "./entity/settings/qualification"; import { member } from "./entity/club/member/member"; import { memberAwards } from "./entity/club/member/memberAwards"; @@ -28,22 +28,22 @@ import { protocolPresence } from "./entity/club/protocol/protocolPresence"; import { protocolVoting } from "./entity/club/protocol/protocolVoting"; import { protocolPrintout } from "./entity/club/protocol/protocolPrintout"; import { calendar } from "./entity/club/calendar"; -import { calendarType } from "./entity/configuration/calendarType"; +import { calendarType } from "./entity/settings/calendarType"; import { reset } from "./entity/reset"; -import { query } from "./entity/configuration/query"; +import { query } from "./entity/settings/query"; import { memberView } from "./views/memberView"; import { memberExecutivePositionsView } from "./views/memberExecutivePositionView"; import { memberQualificationsView } from "./views/memberQualificationsView"; import { membershipView } from "./views/membershipsView"; -import { template } from "./entity/configuration/template"; -import { templateUsage } from "./entity/configuration/templateUsage"; +import { template } from "./entity/settings/template"; +import { templateUsage } from "./entity/settings/templateUsage"; import { newsletter } from "./entity/club/newsletter/newsletter"; import { newsletterDates } from "./entity/club/newsletter/newsletterDates"; import { newsletterRecipients } from "./entity/club/newsletter/newsletterRecipients"; -import { newsletterConfig } from "./entity/configuration/newsletterConfig"; -import { webapi } from "./entity/management/webapi"; -import { webapiPermission } from "./entity/management/webapi_permission"; -import { salutation } from "./entity/configuration/salutation"; +import { newsletterConfig } from "./entity/settings/newsletterConfig"; +import { webapi } from "./entity/user/webapi"; +import { webapiPermission } from "./entity/user/webapi_permission"; +import { salutation } from "./entity/settings/salutation"; import { BackupAndResetDatabase1738166124200 } from "./migrations/1738166124200-BackupAndResetDatabase"; import { CreateSchema1738166167472 } from "./migrations/1738166167472-CreateSchema"; diff --git a/src/entity/club/calendar.ts b/src/entity/club/calendar.ts index 6e64553..e6488f6 100644 --- a/src/entity/club/calendar.ts +++ b/src/entity/club/calendar.ts @@ -10,7 +10,7 @@ import { BeforeUpdate, ColumnType, } from "typeorm"; -import { calendarType } from "../configuration/calendarType"; +import { calendarType } from "../settings/calendarType"; import { getTypeByORM } from "../../migrations/ormHelper"; @Entity() diff --git a/src/entity/club/member/communication.ts b/src/entity/club/member/communication.ts index de3e181..3ec5062 100644 --- a/src/entity/club/member/communication.ts +++ b/src/entity/club/member/communication.ts @@ -1,6 +1,6 @@ import { Column, Entity, ManyToOne, PrimaryColumn } from "typeorm"; import { member } from "./member"; -import { communicationType } from "../../configuration/communicationType"; +import { communicationType } from "../../settings/communicationType"; @Entity() export class communication { diff --git a/src/entity/club/member/member.ts b/src/entity/club/member/member.ts index 1678e39..d387469 100644 --- a/src/entity/club/member/member.ts +++ b/src/entity/club/member/member.ts @@ -4,7 +4,7 @@ import { memberAwards } from "./memberAwards"; import { memberQualifications } from "./memberQualifications"; import { memberExecutivePositions } from "./memberExecutivePositions"; import { communication } from "./communication"; -import { salutation } from "../../configuration/salutation"; +import { salutation } from "../../settings/salutation"; import { getTypeByORM } from "../../../migrations/ormHelper"; @Entity() diff --git a/src/entity/club/member/memberAwards.ts b/src/entity/club/member/memberAwards.ts index ef7aa76..3559024 100644 --- a/src/entity/club/member/memberAwards.ts +++ b/src/entity/club/member/memberAwards.ts @@ -1,6 +1,6 @@ import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm"; import { member } from "./member"; -import { award } from "../../configuration/award"; +import { award } from "../../settings/award"; import { getTypeByORM } from "../../../migrations/ormHelper"; @Entity() diff --git a/src/entity/club/member/memberExecutivePositions.ts b/src/entity/club/member/memberExecutivePositions.ts index 9686497..c972d85 100644 --- a/src/entity/club/member/memberExecutivePositions.ts +++ b/src/entity/club/member/memberExecutivePositions.ts @@ -1,6 +1,6 @@ import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm"; import { member } from "./member"; -import { executivePosition } from "../../configuration/executivePosition"; +import { executivePosition } from "../../settings/executivePosition"; import { getTypeByORM } from "../../../migrations/ormHelper"; @Entity() diff --git a/src/entity/club/member/memberQualifications.ts b/src/entity/club/member/memberQualifications.ts index 40336cd..c4e5a46 100644 --- a/src/entity/club/member/memberQualifications.ts +++ b/src/entity/club/member/memberQualifications.ts @@ -1,6 +1,6 @@ import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm"; import { member } from "./member"; -import { qualification } from "../../configuration/qualification"; +import { qualification } from "../../settings/qualification"; import { getTypeByORM } from "../../../migrations/ormHelper"; @Entity() diff --git a/src/entity/club/member/membership.ts b/src/entity/club/member/membership.ts index 4a4e69c..1186f9c 100644 --- a/src/entity/club/member/membership.ts +++ b/src/entity/club/member/membership.ts @@ -1,6 +1,6 @@ import { Column, ColumnType, Entity, JoinColumn, ManyToOne, PrimaryColumn } from "typeorm"; import { member } from "./member"; -import { membershipStatus } from "../../configuration/membershipStatus"; +import { membershipStatus } from "../../settings/membershipStatus"; import { getTypeByORM } from "../../../migrations/ormHelper"; @Entity() diff --git a/src/entity/club/newsletter/newsletter.ts b/src/entity/club/newsletter/newsletter.ts index 11ac94a..90650e4 100644 --- a/src/entity/club/newsletter/newsletter.ts +++ b/src/entity/club/newsletter/newsletter.ts @@ -2,7 +2,7 @@ import { Column, Entity, ManyToOne, OneToMany, PrimaryColumn } from "typeorm"; import { newsletterDates } from "./newsletterDates"; import { member } from "../member/member"; import { newsletterRecipients } from "./newsletterRecipients"; -import { query } from "../../configuration/query"; +import { query } from "../../settings/query"; @Entity() export class newsletter { diff --git a/src/entity/refresh.ts b/src/entity/refresh.ts index 09f90a7..c9a82e0 100644 --- a/src/entity/refresh.ts +++ b/src/entity/refresh.ts @@ -1,5 +1,5 @@ import { Column, ColumnType, Entity, ManyToOne, PrimaryColumn } from "typeorm"; -import { user } from "./management/user"; +import { user } from "./user/user"; import { getTypeByORM } from "../migrations/ormHelper"; @Entity() diff --git a/src/entity/configuration/award.ts b/src/entity/settings/award.ts similarity index 100% rename from src/entity/configuration/award.ts rename to src/entity/settings/award.ts diff --git a/src/entity/configuration/calendarType.ts b/src/entity/settings/calendarType.ts similarity index 100% rename from src/entity/configuration/calendarType.ts rename to src/entity/settings/calendarType.ts diff --git a/src/entity/configuration/communicationType.ts b/src/entity/settings/communicationType.ts similarity index 100% rename from src/entity/configuration/communicationType.ts rename to src/entity/settings/communicationType.ts diff --git a/src/entity/configuration/executivePosition.ts b/src/entity/settings/executivePosition.ts similarity index 100% rename from src/entity/configuration/executivePosition.ts rename to src/entity/settings/executivePosition.ts diff --git a/src/entity/configuration/membershipStatus.ts b/src/entity/settings/membershipStatus.ts similarity index 100% rename from src/entity/configuration/membershipStatus.ts rename to src/entity/settings/membershipStatus.ts diff --git a/src/entity/configuration/newsletterConfig.ts b/src/entity/settings/newsletterConfig.ts similarity index 100% rename from src/entity/configuration/newsletterConfig.ts rename to src/entity/settings/newsletterConfig.ts diff --git a/src/entity/configuration/qualification.ts b/src/entity/settings/qualification.ts similarity index 100% rename from src/entity/configuration/qualification.ts rename to src/entity/settings/qualification.ts diff --git a/src/entity/configuration/query.ts b/src/entity/settings/query.ts similarity index 100% rename from src/entity/configuration/query.ts rename to src/entity/settings/query.ts diff --git a/src/entity/configuration/salutation.ts b/src/entity/settings/salutation.ts similarity index 100% rename from src/entity/configuration/salutation.ts rename to src/entity/settings/salutation.ts diff --git a/src/entity/configuration/template.ts b/src/entity/settings/template.ts similarity index 100% rename from src/entity/configuration/template.ts rename to src/entity/settings/template.ts diff --git a/src/entity/configuration/templateUsage.ts b/src/entity/settings/templateUsage.ts similarity index 100% rename from src/entity/configuration/templateUsage.ts rename to src/entity/settings/templateUsage.ts diff --git a/src/entity/management/invite.ts b/src/entity/user/invite.ts similarity index 100% rename from src/entity/management/invite.ts rename to src/entity/user/invite.ts diff --git a/src/entity/management/role.ts b/src/entity/user/role.ts similarity index 100% rename from src/entity/management/role.ts rename to src/entity/user/role.ts diff --git a/src/entity/management/role_permission.ts b/src/entity/user/role_permission.ts similarity index 100% rename from src/entity/management/role_permission.ts rename to src/entity/user/role_permission.ts diff --git a/src/entity/management/user.ts b/src/entity/user/user.ts similarity index 100% rename from src/entity/management/user.ts rename to src/entity/user/user.ts diff --git a/src/entity/management/user_permission.ts b/src/entity/user/user_permission.ts similarity index 100% rename from src/entity/management/user_permission.ts rename to src/entity/user/user_permission.ts diff --git a/src/entity/management/webapi.ts b/src/entity/user/webapi.ts similarity index 100% rename from src/entity/management/webapi.ts rename to src/entity/user/webapi.ts diff --git a/src/entity/management/webapi_permission.ts b/src/entity/user/webapi_permission.ts similarity index 100% rename from src/entity/management/webapi_permission.ts rename to src/entity/user/webapi_permission.ts diff --git a/src/factory/admin/club/calendar.ts b/src/factory/admin/club/calendar.ts index 2954be5..33eb7f2 100644 --- a/src/factory/admin/club/calendar.ts +++ b/src/factory/admin/club/calendar.ts @@ -1,6 +1,6 @@ import { calendar } from "../../../entity/club/calendar"; import { CalendarViewModel } from "../../../viewmodel/admin/club/calendar.models"; -import CalendarTypeFactory from "../configuration/calendarType"; +import CalendarTypeFactory from "../settings/calendarType"; export default abstract class CalendarFactory { /** diff --git a/src/factory/admin/club/member/communication.ts b/src/factory/admin/club/member/communication.ts index fc81906..127ab82 100644 --- a/src/factory/admin/club/member/communication.ts +++ b/src/factory/admin/club/member/communication.ts @@ -1,6 +1,6 @@ import { communication } from "../../../../entity/club/member/communication"; import { CommunicationViewModel } from "../../../../viewmodel/admin/club/member/communication.models"; -import CommunicationTypeFactory from "../../configuration/communicationType"; +import CommunicationTypeFactory from "../../settings/communicationType"; export default abstract class CommunicationFactory { /** diff --git a/src/factory/admin/club/member/member.ts b/src/factory/admin/club/member/member.ts index 246c0ae..536b012 100644 --- a/src/factory/admin/club/member/member.ts +++ b/src/factory/admin/club/member/member.ts @@ -1,7 +1,7 @@ import { member } from "../../../../entity/club/member/member"; import { MemberStatisticsViewModel, MemberViewModel } from "../../../../viewmodel/admin/club/member/member.models"; import { memberView } from "../../../../views/memberView"; -import SalutationFactory from "../../configuration/salutation"; +import SalutationFactory from "../../settings/salutation"; import CommunicationFactory from "./communication"; import DateMappingHelper from "./dateMappingHelper"; import MembershipFactory from "./membership"; diff --git a/src/factory/admin/club/newsletter/newsletter.ts b/src/factory/admin/club/newsletter/newsletter.ts index 39c19e3..dff2de4 100644 --- a/src/factory/admin/club/newsletter/newsletter.ts +++ b/src/factory/admin/club/newsletter/newsletter.ts @@ -1,6 +1,6 @@ import { newsletter } from "../../../../entity/club/newsletter/newsletter"; import { NewsletterViewModel } from "../../../../viewmodel/admin/club/newsletter/newsletter.models"; -import QueryStoreFactory from "../../configuration/queryStore"; +import QueryStoreFactory from "../../settings/queryStore"; export default abstract class NewsletterFactory { /** diff --git a/src/factory/admin/configuration/award.ts b/src/factory/admin/settings/award.ts similarity index 78% rename from src/factory/admin/configuration/award.ts rename to src/factory/admin/settings/award.ts index bfcc2f0..3191a4f 100644 --- a/src/factory/admin/configuration/award.ts +++ b/src/factory/admin/settings/award.ts @@ -1,5 +1,5 @@ -import { award } from "../../../entity/configuration/award"; -import { AwardViewModel } from "../../../viewmodel/admin/configuration/award.models"; +import { award } from "../../../entity/settings/award"; +import { AwardViewModel } from "../../../viewmodel/admin/settings/award.models"; export default abstract class AwardFactory { /** diff --git a/src/factory/admin/configuration/calendarType.ts b/src/factory/admin/settings/calendarType.ts similarity index 87% rename from src/factory/admin/configuration/calendarType.ts rename to src/factory/admin/settings/calendarType.ts index 813dbb2..2ee7ce2 100644 --- a/src/factory/admin/configuration/calendarType.ts +++ b/src/factory/admin/settings/calendarType.ts @@ -1,5 +1,5 @@ -import { calendarType } from "../../../entity/configuration/calendarType"; -import { CalendarTypeViewModel } from "../../../viewmodel/admin/configuration/calendarType.models"; +import { calendarType } from "../../../entity/settings/calendarType"; +import { CalendarTypeViewModel } from "../../../viewmodel/admin/settings/calendarType.models"; export default abstract class CalendarTypeFactory { /** diff --git a/src/factory/admin/configuration/communicationType.ts b/src/factory/admin/settings/communicationType.ts similarity index 85% rename from src/factory/admin/configuration/communicationType.ts rename to src/factory/admin/settings/communicationType.ts index b0d54b7..5721f0e 100644 --- a/src/factory/admin/configuration/communicationType.ts +++ b/src/factory/admin/settings/communicationType.ts @@ -1,5 +1,5 @@ -import { communicationType } from "../../../entity/configuration/communicationType"; -import { CommunicationTypeViewModel } from "../../../viewmodel/admin/configuration/communicationType.models"; +import { communicationType } from "../../../entity/settings/communicationType"; +import { CommunicationTypeViewModel } from "../../../viewmodel/admin/settings/communicationType.models"; export default abstract class CommunicationTypeFactory { /** diff --git a/src/factory/admin/configuration/executivePosition.ts b/src/factory/admin/settings/executivePosition.ts similarity index 85% rename from src/factory/admin/configuration/executivePosition.ts rename to src/factory/admin/settings/executivePosition.ts index 8c7a448..5c44bd9 100644 --- a/src/factory/admin/configuration/executivePosition.ts +++ b/src/factory/admin/settings/executivePosition.ts @@ -1,5 +1,5 @@ -import { executivePosition } from "../../../entity/configuration/executivePosition"; -import { ExecutivePositionViewModel } from "../../../viewmodel/admin/configuration/executivePosition.models"; +import { executivePosition } from "../../../entity/settings/executivePosition"; +import { ExecutivePositionViewModel } from "../../../viewmodel/admin/settings/executivePosition.models"; export default abstract class ExecutivePositionFactory { /** diff --git a/src/factory/admin/configuration/membershipStatus.ts b/src/factory/admin/settings/membershipStatus.ts similarity index 85% rename from src/factory/admin/configuration/membershipStatus.ts rename to src/factory/admin/settings/membershipStatus.ts index 98cef48..f45f5b8 100644 --- a/src/factory/admin/configuration/membershipStatus.ts +++ b/src/factory/admin/settings/membershipStatus.ts @@ -1,5 +1,5 @@ -import { membershipStatus } from "../../../entity/configuration/membershipStatus"; -import { MembershipStatusViewModel } from "../../../viewmodel/admin/configuration/membershipStatus.models"; +import { membershipStatus } from "../../../entity/settings/membershipStatus"; +import { MembershipStatusViewModel } from "../../../viewmodel/admin/settings/membershipStatus.models"; export default abstract class MembershipStatusFactory { /** diff --git a/src/factory/admin/configuration/newsletterConfig.ts b/src/factory/admin/settings/newsletterConfig.ts similarity index 87% rename from src/factory/admin/configuration/newsletterConfig.ts rename to src/factory/admin/settings/newsletterConfig.ts index 17d2461..f71889e 100644 --- a/src/factory/admin/configuration/newsletterConfig.ts +++ b/src/factory/admin/settings/newsletterConfig.ts @@ -1,5 +1,5 @@ -import { newsletterConfig } from "../../../entity/configuration/newsletterConfig"; -import { NewsletterConfigViewModel } from "../../../viewmodel/admin/configuration/newsletterConfig.models"; +import { newsletterConfig } from "../../../entity/settings/newsletterConfig"; +import { NewsletterConfigViewModel } from "../../../viewmodel/admin/settings/newsletterConfig.models"; import CommunicationTypeFactory from "./communicationType"; export default abstract class NewsletterConfigFactory { diff --git a/src/factory/admin/configuration/qualification.ts b/src/factory/admin/settings/qualification.ts similarity index 86% rename from src/factory/admin/configuration/qualification.ts rename to src/factory/admin/settings/qualification.ts index 5e59e99..0a6a05f 100644 --- a/src/factory/admin/configuration/qualification.ts +++ b/src/factory/admin/settings/qualification.ts @@ -1,5 +1,5 @@ -import { qualification } from "../../../entity/configuration/qualification"; -import { QualificationViewModel } from "../../../viewmodel/admin/configuration/qualification.models"; +import { qualification } from "../../../entity/settings/qualification"; +import { QualificationViewModel } from "../../../viewmodel/admin/settings/qualification.models"; export default abstract class QualificationFactory { /** diff --git a/src/factory/admin/configuration/queryStore.ts b/src/factory/admin/settings/queryStore.ts similarity index 81% rename from src/factory/admin/configuration/queryStore.ts rename to src/factory/admin/settings/queryStore.ts index 5f7b8a6..067c494 100644 --- a/src/factory/admin/configuration/queryStore.ts +++ b/src/factory/admin/settings/queryStore.ts @@ -1,5 +1,5 @@ -import { query } from "../../../entity/configuration/query"; -import { QueryStoreViewModel } from "../../../viewmodel/admin/configuration/queryStore.models"; +import { query } from "../../../entity/settings/query"; +import { QueryStoreViewModel } from "../../../viewmodel/admin/settings/queryStore.models"; export default abstract class QueryStoreFactory { /** diff --git a/src/factory/admin/configuration/salutation.ts b/src/factory/admin/settings/salutation.ts similarity index 78% rename from src/factory/admin/configuration/salutation.ts rename to src/factory/admin/settings/salutation.ts index 1c65df0..65ac3dd 100644 --- a/src/factory/admin/configuration/salutation.ts +++ b/src/factory/admin/settings/salutation.ts @@ -1,5 +1,5 @@ -import { salutation } from "../../../entity/configuration/salutation"; -import { SalutationViewModel } from "../../../viewmodel/admin/configuration/salutation.models"; +import { salutation } from "../../../entity/settings/salutation"; +import { SalutationViewModel } from "../../../viewmodel/admin/settings/salutation.models"; export default abstract class SalutationFactory { /** diff --git a/src/factory/admin/configuration/template.ts b/src/factory/admin/settings/template.ts similarity index 80% rename from src/factory/admin/configuration/template.ts rename to src/factory/admin/settings/template.ts index 5e8aad1..ba87719 100644 --- a/src/factory/admin/configuration/template.ts +++ b/src/factory/admin/settings/template.ts @@ -1,5 +1,5 @@ -import { template } from "../../../entity/configuration/template"; -import { TemplateViewModel } from "../../../viewmodel/admin/configuration/template.models"; +import { template } from "../../../entity/settings/template"; +import { TemplateViewModel } from "../../../viewmodel/admin/settings/template.models"; export default abstract class TemplateFactory { /** diff --git a/src/factory/admin/configuration/templateUsage.ts b/src/factory/admin/settings/templateUsage.ts similarity index 90% rename from src/factory/admin/configuration/templateUsage.ts rename to src/factory/admin/settings/templateUsage.ts index 784e6d8..a34f50f 100644 --- a/src/factory/admin/configuration/templateUsage.ts +++ b/src/factory/admin/settings/templateUsage.ts @@ -1,5 +1,5 @@ -import { templateUsage } from "../../../entity/configuration/templateUsage"; -import { TemplateUsageViewModel } from "../../../viewmodel/admin/configuration/templateUsage.models"; +import { templateUsage } from "../../../entity/settings/templateUsage"; +import { TemplateUsageViewModel } from "../../../viewmodel/admin/settings/templateUsage.models"; export default abstract class TemplateUsageFactory { /** diff --git a/src/factory/admin/management/invite.ts b/src/factory/admin/user/invite.ts similarity index 81% rename from src/factory/admin/management/invite.ts rename to src/factory/admin/user/invite.ts index 9ff0fc2..6aa5647 100644 --- a/src/factory/admin/management/invite.ts +++ b/src/factory/admin/user/invite.ts @@ -1,5 +1,5 @@ -import { invite } from "../../../entity/management/invite"; -import { InviteViewModel } from "../../../viewmodel/admin/management/invite.models"; +import { invite } from "../../../entity/user/invite"; +import { InviteViewModel } from "../../../viewmodel/admin/user/invite.models"; export default abstract class InviteFactory { /** diff --git a/src/factory/admin/management/role.ts b/src/factory/admin/user/role.ts similarity index 83% rename from src/factory/admin/management/role.ts rename to src/factory/admin/user/role.ts index 56bb479..8490735 100644 --- a/src/factory/admin/management/role.ts +++ b/src/factory/admin/user/role.ts @@ -1,6 +1,6 @@ -import { role } from "../../../entity/management/role"; +import { role } from "../../../entity/user/role"; import PermissionHelper from "../../../helpers/permissionHelper"; -import { RoleViewModel } from "../../../viewmodel/admin/management/role.models"; +import { RoleViewModel } from "../../../viewmodel/admin/user/role.models"; export default abstract class RoleFactory { /** diff --git a/src/factory/admin/management/user.ts b/src/factory/admin/user/user.ts similarity index 90% rename from src/factory/admin/management/user.ts rename to src/factory/admin/user/user.ts index 3910bf2..0a82ace 100644 --- a/src/factory/admin/management/user.ts +++ b/src/factory/admin/user/user.ts @@ -1,6 +1,6 @@ -import { user } from "../../../entity/management/user"; +import { user } from "../../../entity/user/user"; import PermissionHelper from "../../../helpers/permissionHelper"; -import { UserViewModel } from "../../../viewmodel/admin/management/user.models"; +import { UserViewModel } from "../../../viewmodel/admin/user/user.models"; import RoleFactory from "./role"; export default abstract class UserFactory { diff --git a/src/factory/admin/management/webapi.ts b/src/factory/admin/user/webapi.ts similarity index 84% rename from src/factory/admin/management/webapi.ts rename to src/factory/admin/user/webapi.ts index e540ecb..3c0ede4 100644 --- a/src/factory/admin/management/webapi.ts +++ b/src/factory/admin/user/webapi.ts @@ -1,6 +1,6 @@ -import { webapi } from "../../../entity/management/webapi"; +import { webapi } from "../../../entity/user/webapi"; import PermissionHelper from "../../../helpers/permissionHelper"; -import { ApiViewModel } from "../../../viewmodel/admin/management/webapi.models"; +import { ApiViewModel } from "../../../viewmodel/admin/user/webapi.models"; export default abstract class ApiFactory { /** diff --git a/src/helpers/backupHelper.ts b/src/helpers/backupHelper.ts index a60e963..1024943 100644 --- a/src/helpers/backupHelper.ts +++ b/src/helpers/backupHelper.ts @@ -3,7 +3,7 @@ import { FileSystemHelper } from "./fileSystemHelper"; import { EntityManager } from "typeorm"; import uniqBy from "lodash.uniqby"; import InternalException from "../exceptions/internalException"; -import UserService from "../service/management/userService"; +import UserService from "../service/user/userService"; import { BACKUP_COPIES, BACKUP_INTERVAL } from "../env.defaults"; import DatabaseActionException from "../exceptions/databaseActionException"; diff --git a/src/helpers/jwtHelper.ts b/src/helpers/jwtHelper.ts index c16f2a2..11a5232 100644 --- a/src/helpers/jwtHelper.ts +++ b/src/helpers/jwtHelper.ts @@ -2,12 +2,12 @@ import jwt from "jsonwebtoken"; import { JWTData, JWTToken } from "../type/jwtTypes"; import { JWT_SECRET, JWT_EXPIRATION } from "../env.defaults"; import InternalException from "../exceptions/internalException"; -import RolePermissionService from "../service/management/rolePermissionService"; -import UserPermissionService from "../service/management/userPermissionService"; -import UserService from "../service/management/userService"; +import RolePermissionService from "../service/user/rolePermissionService"; +import UserPermissionService from "../service/user/userPermissionService"; +import UserService from "../service/user/userService"; import PermissionHelper from "./permissionHelper"; -import WebapiService from "../service/management/webapiService"; -import WebapiPermissionService from "../service/management/webapiPermissionService"; +import WebapiService from "../service/user/webapiService"; +import WebapiPermissionService from "../service/user/webapiPermissionService"; import ms from "ms"; export abstract class JWTHelper { diff --git a/src/helpers/newsletterHelper.ts b/src/helpers/newsletterHelper.ts index e5e619b..782594a 100644 --- a/src/helpers/newsletterHelper.ts +++ b/src/helpers/newsletterHelper.ts @@ -14,7 +14,7 @@ import MailHelper from "./mailHelper"; import { CLUB_NAME } from "../env.defaults"; import { TemplateHelper } from "./templateHelper"; import { PdfExport } from "./pdfExport"; -import NewsletterConfigService from "../service/configuration/newsletterConfigService"; +import NewsletterConfigService from "../service/settings/newsletterConfigService"; import { NewsletterConfigType } from "../enums/newsletterConfigType"; import InternalException from "../exceptions/internalException"; import EventEmitter from "events"; diff --git a/src/helpers/templateHelper.ts b/src/helpers/templateHelper.ts index fa4be26..f7d8aa6 100644 --- a/src/helpers/templateHelper.ts +++ b/src/helpers/templateHelper.ts @@ -1,6 +1,6 @@ -import TemplateService from "../service/configuration/templateService"; +import TemplateService from "../service/settings/templateService"; import { PermissionModule } from "../type/permissionTypes"; -import TemplateUsageService from "../service/configuration/templateUsageService"; +import TemplateUsageService from "../service/settings/templateUsageService"; import Handlebars, { template } from "handlebars"; import { FileSystemHelper } from "./fileSystemHelper"; @@ -34,7 +34,7 @@ export abstract class TemplateHelper { bodyData = {}, footerData = {}, }: { - module: `${PermissionModule}` | `${PermissionModule}.${string}`; + module: `${PermissionModule}`|`${PermissionModule}.${string}`; title?: string; headerData?: any; bodyData?: any; diff --git a/src/middleware/allowSetup.ts b/src/middleware/allowSetup.ts index 10d53fa..981d955 100644 --- a/src/middleware/allowSetup.ts +++ b/src/middleware/allowSetup.ts @@ -1,5 +1,5 @@ import { NextFunction, Request, Response } from "express"; -import UserService from "../service/management/userService"; +import UserService from "../service/user/userService"; import CustomRequestException from "../exceptions/customRequestException"; export default async function allowSetup(req: Request, res: Response, next: NextFunction) { diff --git a/src/migrations/1738166167472-CreateSchema.ts b/src/migrations/1738166167472-CreateSchema.ts index 5dcd9db..70a6c97 100644 --- a/src/migrations/1738166167472-CreateSchema.ts +++ b/src/migrations/1738166167472-CreateSchema.ts @@ -11,7 +11,7 @@ import { webapi_permission_table, webapi_table, } from "./baseSchemaTables/admin"; -import { templateUsage } from "../entity/configuration/templateUsage"; +import { templateUsage } from "../entity/settings/templateUsage"; import { award_table, communication_type_table, diff --git a/src/routes/admin/index.ts b/src/routes/admin/index.ts index 3dddb4f..59d5990 100644 --- a/src/routes/admin/index.ts +++ b/src/routes/admin/index.ts @@ -2,17 +2,17 @@ import express from "express"; import PermissionHelper from "../../helpers/permissionHelper"; import preventWebapiAccess from "../../middleware/preventWebApiAccess"; -import award from "./configuration/award"; -import communicationType from "./configuration/communicationType"; -import executivePosition from "./configuration/executivePosition"; -import membershipStatus from "./configuration/membershipStatus"; -import qualification from "./configuration/qualification"; -import salutation from "./configuration/salutation"; -import calendarType from "./configuration/calendarType"; -import queryStore from "./configuration/queryStore"; -import template from "./configuration/template"; -import templateUsage from "./configuration/templateUsage"; -import newsletterConfig from "./configuration/newsletterConfig"; +import award from "./settings/award"; +import communicationType from "./settings/communicationType"; +import executivePosition from "./settings/executivePosition"; +import membershipStatus from "./settings/membershipStatus"; +import qualification from "./settings/qualification"; +import salutation from "./settings/salutation"; +import calendarType from "./settings/calendarType"; +import queryStore from "./settings/queryStore"; +import template from "./settings/template"; +import templateUsage from "./settings/templateUsage"; +import newsletterConfig from "./settings/newsletterConfig"; import member from "./club/member"; import protocol from "./club/protocol"; @@ -20,18 +20,18 @@ import calendar from "./club/calendar"; import queryBuilder from "./club/queryBuilder"; import newsletter from "./club/newsletter"; -import role from "./management/role"; -import user from "./management/user"; -import invite from "./management/invite"; -import api from "./management/webapi"; -import backup from "./management/backup"; +import role from "./user/role"; +import user from "./user/user"; +import invite from "./user/invite"; +import api from "./user/webapi"; +import backup from "./user/backup"; var router = express.Router({ mergeParams: true }); router.use( "/award", PermissionHelper.passCheckSomeMiddleware([ - { requiredPermissions: "read", section: "configuration", module: "award" }, + { requiredPermissions: "read", section: "settings", module: "award" }, { requiredPermissions: "read", section: "club", module: "member" }, ]), award @@ -39,7 +39,7 @@ router.use( router.use( "/communicationtype", PermissionHelper.passCheckSomeMiddleware([ - { requiredPermissions: "read", section: "configuration", module: "communication_type" }, + { requiredPermissions: "read", section: "settings", module: "communication_type" }, { requiredPermissions: "read", section: "club", module: "member" }, ]), communicationType @@ -47,7 +47,7 @@ router.use( router.use( "/executiveposition", PermissionHelper.passCheckSomeMiddleware([ - { requiredPermissions: "read", section: "configuration", module: "executive_position" }, + { requiredPermissions: "read", section: "settings", module: "executive_position" }, { requiredPermissions: "read", section: "club", module: "member" }, ]), executivePosition @@ -55,7 +55,7 @@ router.use( router.use( "/membershipstatus", PermissionHelper.passCheckSomeMiddleware([ - { requiredPermissions: "read", section: "configuration", module: "membership_status" }, + { requiredPermissions: "read", section: "settings", module: "membership_status" }, { requiredPermissions: "read", section: "club", module: "member" }, ]), membershipStatus @@ -63,7 +63,7 @@ router.use( router.use( "/qualification", PermissionHelper.passCheckSomeMiddleware([ - { requiredPermissions: "read", section: "configuration", module: "qualification" }, + { requiredPermissions: "read", section: "settings", module: "qualification" }, { requiredPermissions: "read", section: "club", module: "member" }, ]), qualification @@ -71,7 +71,7 @@ router.use( router.use( "/salutation", PermissionHelper.passCheckSomeMiddleware([ - { requiredPermissions: "read", section: "configuration", module: "salutation" }, + { requiredPermissions: "read", section: "settings", module: "salutation" }, { requiredPermissions: "read", section: "club", module: "member" }, ]), salutation @@ -79,26 +79,26 @@ router.use( router.use( "/calendartype", PermissionHelper.passCheckSomeMiddleware([ - { requiredPermissions: "read", section: "configuration", module: "calendar_type" }, + { requiredPermissions: "read", section: "settings", module: "calendar_type" }, { requiredPermissions: "read", section: "club", module: "calendar" }, ]), calendarType ); -router.use("/querystore", PermissionHelper.passCheckMiddleware("read", "configuration", "query_store"), queryStore); -router.use("/template", PermissionHelper.passCheckMiddleware("read", "configuration", "template"), template); +router.use("/querystore", PermissionHelper.passCheckMiddleware("read", "settings", "query_store"), queryStore); +router.use("/template", PermissionHelper.passCheckMiddleware("read", "settings", "template"), template); router.use( "/templateusage", PermissionHelper.passCheckSomeMiddleware([ - { requiredPermissions: "read", section: "configuration", module: "template_usage" }, - { requiredPermissions: "read", section: "configuration", module: "template" }, + { requiredPermissions: "read", section: "settings", module: "template_usage" }, + { requiredPermissions: "read", section: "settings", module: "template" }, ]), templateUsage ); router.use( "/newsletterconfig", PermissionHelper.passCheckSomeMiddleware([ - { requiredPermissions: "read", section: "configuration", module: "newsletter_config" }, - { requiredPermissions: "read", section: "configuration", module: "communication_type" }, + { requiredPermissions: "read", section: "settings", module: "newsletter_config" }, + { requiredPermissions: "read", section: "settings", module: "communication_type" }, ]), newsletterConfig ); @@ -117,7 +117,7 @@ router.use( "/querybuilder", PermissionHelper.passCheckSomeMiddleware([ { requiredPermissions: "read", section: "club", module: "query" }, - { requiredPermissions: "read", section: "configuration", module: "query_store" }, + { requiredPermissions: "read", section: "settings", module: "query_store" }, ]), queryBuilder ); @@ -128,27 +128,22 @@ router.use( { requiredPermissions: "read", section: "club", module: "member" }, { requiredPermissions: "read", section: "club", module: "calendar" }, { requiredPermissions: "read", section: "club", module: "query" }, - { requiredPermissions: "read", section: "configuration", module: "query_store" }, + { requiredPermissions: "read", section: "settings", module: "query_store" }, ]), newsletter ); -router.use("/role", PermissionHelper.passCheckMiddleware("read", "management", "role"), role); +router.use("/role", PermissionHelper.passCheckMiddleware("read", "user", "role"), role); router.use( "/user", PermissionHelper.passCheckSomeMiddleware([ - { requiredPermissions: "read", section: "management", module: "user" }, - { requiredPermissions: "read", section: "management", module: "role" }, + { requiredPermissions: "read", section: "user", module: "user" }, + { requiredPermissions: "read", section: "user", module: "role" }, ]), user ); -router.use("/invite", PermissionHelper.passCheckMiddleware("read", "management", "user"), invite); -router.use("/webapi", preventWebapiAccess, PermissionHelper.passCheckMiddleware("read", "management", "webapi"), api); -router.use( - "/backup", - preventWebapiAccess, - PermissionHelper.passCheckMiddleware("read", "management", "backup"), - backup -); +router.use("/invite", PermissionHelper.passCheckMiddleware("read", "user", "user"), invite); +router.use("/webapi", preventWebapiAccess, PermissionHelper.passCheckMiddleware("read", "user", "webapi"), api); +router.use("/backup", preventWebapiAccess, PermissionHelper.passCheckMiddleware("read", "user", "backup"), backup); export default router; diff --git a/src/routes/admin/configuration/award.ts b/src/routes/admin/settings/award.ts similarity index 73% rename from src/routes/admin/configuration/award.ts rename to src/routes/admin/settings/award.ts index 5873452..d5eddeb 100644 --- a/src/routes/admin/configuration/award.ts +++ b/src/routes/admin/settings/award.ts @@ -5,7 +5,7 @@ import { getAllAwards, getAwardById, updateAward, -} from "../../../controller/admin/configuration/awardController"; +} from "../../../controller/admin/settings/awardController"; import PermissionHelper from "../../../helpers/permissionHelper"; var router = express.Router({ mergeParams: true }); @@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "configuration", "award"), + PermissionHelper.passCheckMiddleware("create", "settings", "award"), async (req: Request, res: Response) => { await createAward(req, res); } @@ -28,7 +28,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "configuration", "award"), + PermissionHelper.passCheckMiddleware("update", "settings", "award"), async (req: Request, res: Response) => { await updateAward(req, res); } @@ -36,7 +36,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "configuration", "award"), + PermissionHelper.passCheckMiddleware("delete", "settings", "award"), async (req: Request, res: Response) => { await deleteAward(req, res); } diff --git a/src/routes/admin/configuration/calendarType.ts b/src/routes/admin/settings/calendarType.ts similarity index 80% rename from src/routes/admin/configuration/calendarType.ts rename to src/routes/admin/settings/calendarType.ts index 1455c20..37cf230 100644 --- a/src/routes/admin/configuration/calendarType.ts +++ b/src/routes/admin/settings/calendarType.ts @@ -25,7 +25,7 @@ router.get("/:id", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "configuration", "calendar_type"), + PermissionHelper.passCheckMiddleware("create", "settings", "calendar_type"), async (req: Request, res: Response) => { await createCalendarType(req, res); } @@ -33,7 +33,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "configuration", "calendar_type"), + PermissionHelper.passCheckMiddleware("update", "settings", "calendar_type"), async (req: Request, res: Response) => { await updateCalendarType(req, res); } @@ -41,7 +41,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "configuration", "calendar_type"), + PermissionHelper.passCheckMiddleware("delete", "settings", "calendar_type"), async (req: Request, res: Response) => { await deleteCalendarType(req, res); } diff --git a/src/routes/admin/configuration/communicationType.ts b/src/routes/admin/settings/communicationType.ts similarity index 75% rename from src/routes/admin/configuration/communicationType.ts rename to src/routes/admin/settings/communicationType.ts index b00bbef..aaf3c46 100644 --- a/src/routes/admin/configuration/communicationType.ts +++ b/src/routes/admin/settings/communicationType.ts @@ -6,7 +6,7 @@ import { getCommunicationTypeAvailableColumns, getCommunicationTypeById, updateCommunicationType, -} from "../../../controller/admin/configuration/communicationTypeController"; +} from "../../../controller/admin/settings/communicationTypeController"; import PermissionHelper from "../../../helpers/permissionHelper"; var router = express.Router({ mergeParams: true }); @@ -25,7 +25,7 @@ router.get("/:id", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "configuration", "communication_type"), + PermissionHelper.passCheckMiddleware("create", "settings", "communication_type"), async (req: Request, res: Response) => { await createCommunicationType(req, res); } @@ -33,7 +33,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "configuration", "communication_type"), + PermissionHelper.passCheckMiddleware("update", "settings", "communication_type"), async (req: Request, res: Response) => { await updateCommunicationType(req, res); } @@ -41,7 +41,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "configuration", "communication_type"), + PermissionHelper.passCheckMiddleware("delete", "settings", "communication_type"), async (req: Request, res: Response) => { await deleteCommunicationType(req, res); } diff --git a/src/routes/admin/configuration/executivePosition.ts b/src/routes/admin/settings/executivePosition.ts similarity index 72% rename from src/routes/admin/configuration/executivePosition.ts rename to src/routes/admin/settings/executivePosition.ts index d0cbf01..dd698ea 100644 --- a/src/routes/admin/configuration/executivePosition.ts +++ b/src/routes/admin/settings/executivePosition.ts @@ -5,7 +5,7 @@ import { getAllExecutivePositions, getExecutivePositionById, updateExecutivePosition, -} from "../../../controller/admin/configuration/executivePositionController"; +} from "../../../controller/admin/settings/executivePositionController"; import PermissionHelper from "../../../helpers/permissionHelper"; var router = express.Router({ mergeParams: true }); @@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "configuration", "executive_position"), + PermissionHelper.passCheckMiddleware("create", "settings", "executive_position"), async (req: Request, res: Response) => { await createExecutivePosition(req, res); } @@ -28,7 +28,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "configuration", "executive_position"), + PermissionHelper.passCheckMiddleware("update", "settings", "executive_position"), async (req: Request, res: Response) => { await updateExecutivePosition(req, res); } @@ -36,7 +36,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "configuration", "executive_position"), + PermissionHelper.passCheckMiddleware("delete", "settings", "executive_position"), async (req: Request, res: Response) => { await deleteExecutivePosition(req, res); } diff --git a/src/routes/admin/configuration/membershipStatus.ts b/src/routes/admin/settings/membershipStatus.ts similarity index 72% rename from src/routes/admin/configuration/membershipStatus.ts rename to src/routes/admin/settings/membershipStatus.ts index 46c47d9..72673f1 100644 --- a/src/routes/admin/configuration/membershipStatus.ts +++ b/src/routes/admin/settings/membershipStatus.ts @@ -5,7 +5,7 @@ import { getAllMembershipStatus, getMembershipStatusById, updateMembershipStatus, -} from "../../../controller/admin/configuration/membershipStatusController"; +} from "../../../controller/admin/settings/membershipStatusController"; import PermissionHelper from "../../../helpers/permissionHelper"; var router = express.Router({ mergeParams: true }); @@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "configuration", "membership_status"), + PermissionHelper.passCheckMiddleware("create", "settings", "membership_status"), async (req: Request, res: Response) => { await createMembershipStatus(req, res); } @@ -28,7 +28,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "configuration", "membership_status"), + PermissionHelper.passCheckMiddleware("update", "settings", "membership_status"), async (req: Request, res: Response) => { await updateMembershipStatus(req, res); } @@ -36,7 +36,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "configuration", "membership_status"), + PermissionHelper.passCheckMiddleware("delete", "settings", "membership_status"), async (req: Request, res: Response) => { await deleteMembershipStatus(req, res); } diff --git a/src/routes/admin/configuration/newsletterConfig.ts b/src/routes/admin/settings/newsletterConfig.ts similarity index 75% rename from src/routes/admin/configuration/newsletterConfig.ts rename to src/routes/admin/settings/newsletterConfig.ts index b1b805b..a874cc7 100644 --- a/src/routes/admin/configuration/newsletterConfig.ts +++ b/src/routes/admin/settings/newsletterConfig.ts @@ -4,7 +4,7 @@ import { getAllNewsletterConfigs, getNewsletterConfigById, setNewsletterConfig, -} from "../../../controller/admin/configuration/newsletterConfigController"; +} from "../../../controller/admin/settings/newsletterConfigController"; import PermissionHelper from "../../../helpers/permissionHelper"; var router = express.Router({ mergeParams: true }); @@ -19,7 +19,7 @@ router.get("/:id", async (req: Request, res: Response) => { router.put( "/", - PermissionHelper.passCheckMiddleware("create", "configuration", "newsletter_config"), + PermissionHelper.passCheckMiddleware("create", "settings", "newsletter_config"), async (req: Request, res: Response) => { await setNewsletterConfig(req, res); } @@ -27,7 +27,7 @@ router.put( router.delete( "/:comTypeId", - PermissionHelper.passCheckMiddleware("create", "configuration", "newsletter_config"), + PermissionHelper.passCheckMiddleware("create", "settings", "newsletter_config"), async (req: Request, res: Response) => { await deleteNewsletterConfig(req, res); } diff --git a/src/routes/admin/configuration/qualification.ts b/src/routes/admin/settings/qualification.ts similarity index 72% rename from src/routes/admin/configuration/qualification.ts rename to src/routes/admin/settings/qualification.ts index 80babc1..efa34a8 100644 --- a/src/routes/admin/configuration/qualification.ts +++ b/src/routes/admin/settings/qualification.ts @@ -5,7 +5,7 @@ import { getAllQualifications, getQualificationById, updateQualification, -} from "../../../controller/admin/configuration/qualificationController"; +} from "../../../controller/admin/settings/qualificationController"; import PermissionHelper from "../../../helpers/permissionHelper"; var router = express.Router({ mergeParams: true }); @@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "configuration", "qualification"), + PermissionHelper.passCheckMiddleware("create", "settings", "qualification"), async (req: Request, res: Response) => { await createQualification(req, res); } @@ -28,7 +28,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "configuration", "qualification"), + PermissionHelper.passCheckMiddleware("update", "settings", "qualification"), async (req: Request, res: Response) => { await updateQualification(req, res); } @@ -36,7 +36,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "configuration", "qualification"), + PermissionHelper.passCheckMiddleware("delete", "settings", "qualification"), async (req: Request, res: Response) => { await deleteQualification(req, res); } diff --git a/src/routes/admin/configuration/queryStore.ts b/src/routes/admin/settings/queryStore.ts similarity index 72% rename from src/routes/admin/configuration/queryStore.ts rename to src/routes/admin/settings/queryStore.ts index a9963d9..85b408c 100644 --- a/src/routes/admin/configuration/queryStore.ts +++ b/src/routes/admin/settings/queryStore.ts @@ -6,7 +6,7 @@ import { getAllQueryStores, getQueryStoreById, updateQueryStore, -} from "../../../controller/admin/configuration/queryStoreController"; +} from "../../../controller/admin/settings/queryStoreController"; var router = express.Router({ mergeParams: true }); @@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "configuration", "query_store"), + PermissionHelper.passCheckMiddleware("create", "settings", "query_store"), async (req: Request, res: Response) => { await createQueryStore(req, res); } @@ -28,7 +28,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "configuration", "query_store"), + PermissionHelper.passCheckMiddleware("update", "settings", "query_store"), async (req: Request, res: Response) => { await updateQueryStore(req, res); } @@ -36,7 +36,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "configuration", "query_store"), + PermissionHelper.passCheckMiddleware("delete", "settings", "query_store"), async (req: Request, res: Response) => { await deleteQueryStore(req, res); } diff --git a/src/routes/admin/configuration/salutation.ts b/src/routes/admin/settings/salutation.ts similarity index 72% rename from src/routes/admin/configuration/salutation.ts rename to src/routes/admin/settings/salutation.ts index bf4eb84..c4c53a0 100644 --- a/src/routes/admin/configuration/salutation.ts +++ b/src/routes/admin/settings/salutation.ts @@ -5,7 +5,7 @@ import { getAllSalutations, getSalutationById, updateSalutation, -} from "../../../controller/admin/configuration/salutationController"; +} from "../../../controller/admin/settings/salutationController"; import PermissionHelper from "../../../helpers/permissionHelper"; var router = express.Router({ mergeParams: true }); @@ -20,7 +20,7 @@ router.get("/:id", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "configuration", "salutation"), + PermissionHelper.passCheckMiddleware("create", "settings", "salutation"), async (req: Request, res: Response) => { await createSalutation(req, res); } @@ -28,7 +28,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "configuration", "salutation"), + PermissionHelper.passCheckMiddleware("update", "settings", "salutation"), async (req: Request, res: Response) => { await updateSalutation(req, res); } @@ -36,7 +36,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "configuration", "salutation"), + PermissionHelper.passCheckMiddleware("delete", "settings", "salutation"), async (req: Request, res: Response) => { await deleteSalutation(req, res); } diff --git a/src/routes/admin/configuration/template.ts b/src/routes/admin/settings/template.ts similarity index 71% rename from src/routes/admin/configuration/template.ts rename to src/routes/admin/settings/template.ts index d8dd35f..e04f7d4 100644 --- a/src/routes/admin/configuration/template.ts +++ b/src/routes/admin/settings/template.ts @@ -6,7 +6,7 @@ import { getAllTemplates, getTemplateById, updateTemplate, -} from "../../../controller/admin/configuration/templateController"; +} from "../../../controller/admin/settings/templateController"; import PermissionHelper from "../../../helpers/permissionHelper"; var router = express.Router({ mergeParams: true }); @@ -21,7 +21,7 @@ router.get("/:id", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "configuration", "template"), + PermissionHelper.passCheckMiddleware("create", "settings", "template"), async (req: Request, res: Response) => { await createTemplate(req, res); } @@ -29,7 +29,7 @@ router.post( router.post( "/clone", - PermissionHelper.passCheckMiddleware("create", "configuration", "template"), + PermissionHelper.passCheckMiddleware("create", "settings", "template"), async (req: Request, res: Response) => { await cloneTemplate(req, res); } @@ -37,7 +37,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "configuration", "template"), + PermissionHelper.passCheckMiddleware("update", "settings", "template"), async (req: Request, res: Response) => { await updateTemplate(req, res); } @@ -45,7 +45,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "configuration", "template"), + PermissionHelper.passCheckMiddleware("delete", "settings", "template"), async (req: Request, res: Response) => { await deleteTemplate(req, res); } diff --git a/src/routes/admin/configuration/templateUsage.ts b/src/routes/admin/settings/templateUsage.ts similarity index 82% rename from src/routes/admin/configuration/templateUsage.ts rename to src/routes/admin/settings/templateUsage.ts index 36f6bb9..6c8f3a9 100644 --- a/src/routes/admin/configuration/templateUsage.ts +++ b/src/routes/admin/settings/templateUsage.ts @@ -4,7 +4,7 @@ import { getAllTemplateUsages, printTemplateUsageDemo, updateTemplateUsage, -} from "../../../controller/admin/configuration/templateUsageController"; +} from "../../../controller/admin/settings/templateUsageController"; import { PermissionModule } from "../../../type/permissionTypes"; import ForbiddenRequestException from "../../../exceptions/forbiddenRequestException"; @@ -20,7 +20,7 @@ router.get("/:scope", async (req: Request, res: Response) => { router.patch( "/:scope", - PermissionHelper.passCheckMiddleware("update", "configuration", "template_usage"), + PermissionHelper.passCheckMiddleware("update", "settings", "template_usage"), async (req: Request, res: Response) => { await updateTemplateUsage(req, res); } diff --git a/src/routes/admin/management/backup.ts b/src/routes/admin/user/backup.ts similarity index 84% rename from src/routes/admin/management/backup.ts rename to src/routes/admin/user/backup.ts index f093554..b486a49 100644 --- a/src/routes/admin/management/backup.ts +++ b/src/routes/admin/user/backup.ts @@ -10,7 +10,7 @@ import { restoreBackupByLocalFile, restoreBackupByUploadedFile, uploadBackupFile, -} from "../../../controller/admin/management/backupController"; +} from "../../../controller/admin/user/backupController"; import { FileSystemHelper } from "../../../helpers/fileSystemHelper"; const storage = multer.diskStorage({ @@ -54,7 +54,7 @@ router.get("/uploaded/:filename", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "management", "backup"), + PermissionHelper.passCheckMiddleware("create", "user", "backup"), async (req: Request, res: Response) => { await createManualBackup(req, res); } @@ -62,7 +62,7 @@ router.post( router.post( "/generated/restore", - PermissionHelper.passCheckMiddleware("admin", "management", "backup"), + PermissionHelper.passCheckMiddleware("admin", "user", "backup"), async (req: Request, res: Response) => { await restoreBackupByLocalFile(req, res); } @@ -70,7 +70,7 @@ router.post( router.post( "/uploaded/restore", - PermissionHelper.passCheckMiddleware("admin", "management", "backup"), + PermissionHelper.passCheckMiddleware("admin", "user", "backup"), async (req: Request, res: Response) => { await restoreBackupByUploadedFile(req, res); } @@ -78,7 +78,7 @@ router.post( router.post( "/upload", - PermissionHelper.passCheckMiddleware("create", "management", "backup"), + PermissionHelper.passCheckMiddleware("create", "user", "backup"), upload.single("file"), async (req: Request, res: Response) => { await uploadBackupFile(req, res); diff --git a/src/routes/admin/management/invite.ts b/src/routes/admin/user/invite.ts similarity index 80% rename from src/routes/admin/management/invite.ts rename to src/routes/admin/user/invite.ts index 3f6f7d8..814a13c 100644 --- a/src/routes/admin/management/invite.ts +++ b/src/routes/admin/user/invite.ts @@ -10,7 +10,7 @@ router.get("/", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "management", "user"), + PermissionHelper.passCheckMiddleware("create", "user", "user"), async (req: Request, res: Response) => { await inviteUser(req, res); } @@ -18,7 +18,7 @@ router.post( router.delete( "/:mail", - PermissionHelper.passCheckMiddleware("delete", "management", "user"), + PermissionHelper.passCheckMiddleware("delete", "user", "user"), async (req: Request, res: Response) => { await deleteInvite(req, res); } diff --git a/src/routes/admin/management/role.ts b/src/routes/admin/user/role.ts similarity index 75% rename from src/routes/admin/management/role.ts rename to src/routes/admin/user/role.ts index 1087920..c9f831c 100644 --- a/src/routes/admin/management/role.ts +++ b/src/routes/admin/user/role.ts @@ -8,7 +8,7 @@ import { getRolePermissions, updateRole, updateRolePermissions, -} from "../../../controller/admin/management/roleController"; +} from "../../../controller/admin/user/roleController"; var router = express.Router({ mergeParams: true }); @@ -26,7 +26,7 @@ router.get("/:id/permissions", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "management", "role"), + PermissionHelper.passCheckMiddleware("create", "user", "role"), async (req: Request, res: Response) => { await createRole(req, res); } @@ -34,7 +34,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "management", "role"), + PermissionHelper.passCheckMiddleware("update", "user", "role"), async (req: Request, res: Response) => { await updateRole(req, res); } @@ -42,7 +42,7 @@ router.patch( router.patch( "/:id/permissions", - PermissionHelper.passCheckMiddleware("admin", "management", "role"), + PermissionHelper.passCheckMiddleware("admin", "user", "role"), async (req: Request, res: Response) => { await updateRolePermissions(req, res); } @@ -50,7 +50,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "management", "role"), + PermissionHelper.passCheckMiddleware("delete", "user", "role"), async (req: Request, res: Response) => { await deleteRole(req, res); } diff --git a/src/routes/admin/management/user.ts b/src/routes/admin/user/user.ts similarity index 78% rename from src/routes/admin/management/user.ts rename to src/routes/admin/user/user.ts index 3a419d6..693e8ea 100644 --- a/src/routes/admin/management/user.ts +++ b/src/routes/admin/user/user.ts @@ -9,7 +9,7 @@ import { updateUser, updateUserPermissions, updateUserRoles, -} from "../../../controller/admin/management/userController"; +} from "../../../controller/admin/user/userController"; import { inviteUser } from "../../../controller/inviteController"; var router = express.Router({ mergeParams: true }); @@ -32,7 +32,7 @@ router.get("/:id/roles", async (req: Request, res: Response) => { router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "management", "user"), + PermissionHelper.passCheckMiddleware("update", "user", "user"), async (req: Request, res: Response) => { await updateUser(req, res); } @@ -40,7 +40,7 @@ router.patch( router.patch( "/:id/permissions", - PermissionHelper.passCheckMiddleware("admin", "management", "user"), + PermissionHelper.passCheckMiddleware("admin", "user", "user"), async (req: Request, res: Response) => { await updateUserPermissions(req, res); } @@ -48,7 +48,7 @@ router.patch( router.patch( "/:id/roles", - PermissionHelper.passCheckMiddleware("update", "management", "user"), + PermissionHelper.passCheckMiddleware("update", "user", "user"), async (req: Request, res: Response) => { await updateUserRoles(req, res); } @@ -56,7 +56,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "management", "user"), + PermissionHelper.passCheckMiddleware("delete", "user", "user"), async (req: Request, res: Response) => { await deleteUser(req, res); } diff --git a/src/routes/admin/management/webapi.ts b/src/routes/admin/user/webapi.ts similarity index 77% rename from src/routes/admin/management/webapi.ts rename to src/routes/admin/user/webapi.ts index e8d2f87..0d0e7ab 100644 --- a/src/routes/admin/management/webapi.ts +++ b/src/routes/admin/user/webapi.ts @@ -9,7 +9,7 @@ import { getWebapiTokenById, updateWebapi, updateWebapiPermissions, -} from "../../../controller/admin/management/webapiController"; +} from "../../../controller/admin/user/webapiController"; var router = express.Router({ mergeParams: true }); @@ -31,7 +31,7 @@ router.get("/:id/permissions", async (req: Request, res: Response) => { router.post( "/", - PermissionHelper.passCheckMiddleware("create", "management", "webapi"), + PermissionHelper.passCheckMiddleware("create", "user", "webapi"), async (req: Request, res: Response) => { await createWebapi(req, res); } @@ -39,7 +39,7 @@ router.post( router.patch( "/:id", - PermissionHelper.passCheckMiddleware("update", "management", "webapi"), + PermissionHelper.passCheckMiddleware("update", "user", "webapi"), async (req: Request, res: Response) => { await updateWebapi(req, res); } @@ -47,7 +47,7 @@ router.patch( router.patch( "/:id/permissions", - PermissionHelper.passCheckMiddleware("admin", "management", "webapi"), + PermissionHelper.passCheckMiddleware("admin", "user", "webapi"), async (req: Request, res: Response) => { await updateWebapiPermissions(req, res); } @@ -55,7 +55,7 @@ router.patch( router.delete( "/:id", - PermissionHelper.passCheckMiddleware("delete", "management", "webapi"), + PermissionHelper.passCheckMiddleware("delete", "user", "webapi"), async (req: Request, res: Response) => { await deleteWebapi(req, res); } diff --git a/src/service/configuration/awardService.ts b/src/service/settings/awardService.ts similarity index 95% rename from src/service/configuration/awardService.ts rename to src/service/settings/awardService.ts index 223d676..cdf95d8 100644 --- a/src/service/configuration/awardService.ts +++ b/src/service/settings/awardService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { award } from "../../entity/configuration/award"; +import { award } from "../../entity/settings/award"; import { member } from "../../entity/club/member/member"; import InternalException from "../../exceptions/internalException"; import DatabaseActionException from "../../exceptions/databaseActionException"; diff --git a/src/service/configuration/calendarTypeService.ts b/src/service/settings/calendarTypeService.ts similarity index 96% rename from src/service/configuration/calendarTypeService.ts rename to src/service/settings/calendarTypeService.ts index 7d82ef4..74be65f 100644 --- a/src/service/configuration/calendarTypeService.ts +++ b/src/service/settings/calendarTypeService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { calendarType } from "../../entity/configuration/calendarType"; +import { calendarType } from "../../entity/settings/calendarType"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/configuration/communicationTypeService.ts b/src/service/settings/communicationTypeService.ts similarity index 93% rename from src/service/configuration/communicationTypeService.ts rename to src/service/settings/communicationTypeService.ts index 4ee9de0..fa71786 100644 --- a/src/service/configuration/communicationTypeService.ts +++ b/src/service/settings/communicationTypeService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { communicationType } from "../../entity/configuration/communicationType"; +import { communicationType } from "../../entity/settings/communicationType"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/configuration/executivePositionService.ts b/src/service/settings/executivePositionService.ts similarity index 94% rename from src/service/configuration/executivePositionService.ts rename to src/service/settings/executivePositionService.ts index 6a2bf8d..ef161d3 100644 --- a/src/service/configuration/executivePositionService.ts +++ b/src/service/settings/executivePositionService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { executivePosition } from "../../entity/configuration/executivePosition"; +import { executivePosition } from "../../entity/settings/executivePosition"; import { memberExecutivePositions } from "../../entity/club/member/memberExecutivePositions"; import InternalException from "../../exceptions/internalException"; import DatabaseActionException from "../../exceptions/databaseActionException"; diff --git a/src/service/configuration/membershipStatusService.ts b/src/service/settings/membershipStatusService.ts similarity index 94% rename from src/service/configuration/membershipStatusService.ts rename to src/service/settings/membershipStatusService.ts index ade5a53..317f788 100644 --- a/src/service/configuration/membershipStatusService.ts +++ b/src/service/settings/membershipStatusService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { membershipStatus } from "../../entity/configuration/membershipStatus"; +import { membershipStatus } from "../../entity/settings/membershipStatus"; import InternalException from "../../exceptions/internalException"; import { membership } from "../../entity/club/member/membership"; import DatabaseActionException from "../../exceptions/databaseActionException"; diff --git a/src/service/configuration/newsletterConfigService.ts b/src/service/settings/newsletterConfigService.ts similarity index 94% rename from src/service/configuration/newsletterConfigService.ts rename to src/service/settings/newsletterConfigService.ts index 64c4c7d..104968b 100644 --- a/src/service/configuration/newsletterConfigService.ts +++ b/src/service/settings/newsletterConfigService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { newsletterConfig } from "../../entity/configuration/newsletterConfig"; +import { newsletterConfig } from "../../entity/settings/newsletterConfig"; import { member } from "../../entity/club/member/member"; import InternalException from "../../exceptions/internalException"; import DatabaseActionException from "../../exceptions/databaseActionException"; diff --git a/src/service/configuration/qualification.ts b/src/service/settings/qualification.ts similarity index 91% rename from src/service/configuration/qualification.ts rename to src/service/settings/qualification.ts index 137bda2..2d232d7 100644 --- a/src/service/configuration/qualification.ts +++ b/src/service/settings/qualification.ts @@ -1,7 +1,7 @@ import { dataSource } from "../../data-source"; import { memberQualifications } from "../../entity/club/member/memberQualifications"; -import { qualification } from "../../entity/configuration/qualification"; -import { user } from "../../entity/management/user"; +import { qualification } from "../../entity/settings/qualification"; +import { user } from "../../entity/user/user"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/configuration/queryStoreService.ts b/src/service/settings/queryStoreService.ts similarity index 95% rename from src/service/configuration/queryStoreService.ts rename to src/service/settings/queryStoreService.ts index 46bbc4c..5a4edcb 100644 --- a/src/service/configuration/queryStoreService.ts +++ b/src/service/settings/queryStoreService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { query } from "../../entity/configuration/query"; +import { query } from "../../entity/settings/query"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/configuration/salutationService.ts b/src/service/settings/salutationService.ts similarity index 94% rename from src/service/configuration/salutationService.ts rename to src/service/settings/salutationService.ts index f8a020e..2337748 100644 --- a/src/service/configuration/salutationService.ts +++ b/src/service/settings/salutationService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { salutation } from "../../entity/configuration/salutation"; +import { salutation } from "../../entity/settings/salutation"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/configuration/templateService.ts b/src/service/settings/templateService.ts similarity index 95% rename from src/service/configuration/templateService.ts rename to src/service/settings/templateService.ts index dd3e008..e605ab9 100644 --- a/src/service/configuration/templateService.ts +++ b/src/service/settings/templateService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { template } from "../../entity/configuration/template"; +import { template } from "../../entity/settings/template"; import { member } from "../../entity/club/member/member"; import InternalException from "../../exceptions/internalException"; import DatabaseActionException from "../../exceptions/databaseActionException"; diff --git a/src/service/configuration/templateUsageService.ts b/src/service/settings/templateUsageService.ts similarity index 95% rename from src/service/configuration/templateUsageService.ts rename to src/service/settings/templateUsageService.ts index ce6b508..cfa1d25 100644 --- a/src/service/configuration/templateUsageService.ts +++ b/src/service/settings/templateUsageService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { templateUsage } from "../../entity/configuration/templateUsage"; +import { templateUsage } from "../../entity/settings/templateUsage"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/management/inviteService.ts b/src/service/user/inviteService.ts similarity index 95% rename from src/service/management/inviteService.ts rename to src/service/user/inviteService.ts index 573975a..b2cd07a 100644 --- a/src/service/management/inviteService.ts +++ b/src/service/user/inviteService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { invite } from "../../entity/management/invite"; +import { invite } from "../../entity/user/invite"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/management/rolePermissionService.ts b/src/service/user/rolePermissionService.ts similarity index 90% rename from src/service/management/rolePermissionService.ts rename to src/service/user/rolePermissionService.ts index c96c73b..1cfe6f2 100644 --- a/src/service/management/rolePermissionService.ts +++ b/src/service/user/rolePermissionService.ts @@ -1,6 +1,6 @@ import { dataSource } from "../../data-source"; -import { rolePermission } from "../../entity/management/role_permission"; -import { userPermission } from "../../entity/management/user_permission"; +import { rolePermission } from "../../entity/user/role_permission"; +import { userPermission } from "../../entity/user/user_permission"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/management/roleService.ts b/src/service/user/roleService.ts similarity index 95% rename from src/service/management/roleService.ts rename to src/service/user/roleService.ts index c3a2dcd..7601063 100644 --- a/src/service/management/roleService.ts +++ b/src/service/user/roleService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { role } from "../../entity/management/role"; +import { role } from "../../entity/user/role"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/management/userPermissionService.ts b/src/service/user/userPermissionService.ts similarity index 91% rename from src/service/management/userPermissionService.ts rename to src/service/user/userPermissionService.ts index 0be67e0..0dee9da 100644 --- a/src/service/management/userPermissionService.ts +++ b/src/service/user/userPermissionService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { userPermission } from "../../entity/management/user_permission"; +import { userPermission } from "../../entity/user/user_permission"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/management/userService.ts b/src/service/user/userService.ts similarity index 97% rename from src/service/management/userService.ts rename to src/service/user/userService.ts index 8fe4dd4..2abb7f7 100644 --- a/src/service/management/userService.ts +++ b/src/service/user/userService.ts @@ -1,6 +1,6 @@ import { dataSource } from "../../data-source"; -import { role } from "../../entity/management/role"; -import { user } from "../../entity/management/user"; +import { role } from "../../entity/user/role"; +import { user } from "../../entity/user/user"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/management/webapiPermissionService.ts b/src/service/user/webapiPermissionService.ts similarity index 91% rename from src/service/management/webapiPermissionService.ts rename to src/service/user/webapiPermissionService.ts index 114d9db..ab57582 100644 --- a/src/service/management/webapiPermissionService.ts +++ b/src/service/user/webapiPermissionService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { webapiPermission } from "../../entity/management/webapi_permission"; +import { webapiPermission } from "../../entity/user/webapi_permission"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/service/management/webapiService.ts b/src/service/user/webapiService.ts similarity index 97% rename from src/service/management/webapiService.ts rename to src/service/user/webapiService.ts index eeae20d..571a013 100644 --- a/src/service/management/webapiService.ts +++ b/src/service/user/webapiService.ts @@ -1,5 +1,5 @@ import { dataSource } from "../../data-source"; -import { webapi } from "../../entity/management/webapi"; +import { webapi } from "../../entity/user/webapi"; import DatabaseActionException from "../../exceptions/databaseActionException"; import InternalException from "../../exceptions/internalException"; diff --git a/src/type/permissionTypes.ts b/src/type/permissionTypes.ts index a031c0e..e3d3105 100644 --- a/src/type/permissionTypes.ts +++ b/src/type/permissionTypes.ts @@ -1,4 +1,4 @@ -export type PermissionSection = "club" | "configuration" | "management"; +export type PermissionSection = "club" | "settings" | "user"; export type PermissionModule = | "member" @@ -43,7 +43,7 @@ export type SectionsAndModulesObject = { [section in PermissionSection]: Array; }; -export const permissionSections: Array = ["club", "configuration", "management"]; +export const permissionSections: Array = ["club", "settings", "user"]; export const permissionModules: Array = [ "member", "calendar", @@ -69,7 +69,7 @@ export const permissionModules: Array = [ export const permissionTypes: Array = ["read", "create", "update", "delete"]; export const sectionsAndModules: SectionsAndModulesObject = { club: ["member", "calendar", "newsletter", "protocol", "query"], - configuration: [ + settings: [ "qualification", "award", "executive_position", @@ -82,5 +82,5 @@ export const sectionsAndModules: SectionsAndModulesObject = { "template_usage", "newsletter_config", ], - management: ["user", "role", "webapi", "backup"], + user: ["user", "role", "webapi", "backup"], }; diff --git a/src/viewmodel/admin/club/calendar.models.ts b/src/viewmodel/admin/club/calendar.models.ts index cda3277..77a9622 100644 --- a/src/viewmodel/admin/club/calendar.models.ts +++ b/src/viewmodel/admin/club/calendar.models.ts @@ -1,4 +1,4 @@ -import { CalendarTypeViewModel } from "../configuration/calendarType.models"; +import { CalendarTypeViewModel } from "../settings/calendarType.models"; export interface CalendarViewModel { id: string; diff --git a/src/viewmodel/admin/club/member/communication.models.ts b/src/viewmodel/admin/club/member/communication.models.ts index 38235eb..b6c0b29 100644 --- a/src/viewmodel/admin/club/member/communication.models.ts +++ b/src/viewmodel/admin/club/member/communication.models.ts @@ -1,4 +1,4 @@ -import { CommunicationTypeViewModel } from "../../configuration/communicationType.models"; +import { CommunicationTypeViewModel } from "../../settings/communicationType.models"; export interface CommunicationViewModel { id: number; diff --git a/src/viewmodel/admin/club/member/member.models.ts b/src/viewmodel/admin/club/member/member.models.ts index 2a0f37b..69f1bdf 100644 --- a/src/viewmodel/admin/club/member/member.models.ts +++ b/src/viewmodel/admin/club/member/member.models.ts @@ -1,4 +1,4 @@ -import { SalutationViewModel } from "../../configuration/salutation.models"; +import { SalutationViewModel } from "../../settings/salutation.models"; import { CommunicationViewModel } from "./communication.models"; import { MembershipViewModel } from "./membership.models"; diff --git a/src/viewmodel/admin/club/newsletter/newsletter.models.ts b/src/viewmodel/admin/club/newsletter/newsletter.models.ts index ea42e46..9cf9bb6 100644 --- a/src/viewmodel/admin/club/newsletter/newsletter.models.ts +++ b/src/viewmodel/admin/club/newsletter/newsletter.models.ts @@ -1,4 +1,4 @@ -import { QueryStoreViewModel } from "../../configuration/queryStore.models"; +import { QueryStoreViewModel } from "../../settings/queryStore.models"; export interface NewsletterViewModel { id: number; diff --git a/src/viewmodel/admin/configuration/award.models.ts b/src/viewmodel/admin/settings/award.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/award.models.ts rename to src/viewmodel/admin/settings/award.models.ts diff --git a/src/viewmodel/admin/configuration/calendarType.models.ts b/src/viewmodel/admin/settings/calendarType.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/calendarType.models.ts rename to src/viewmodel/admin/settings/calendarType.models.ts diff --git a/src/viewmodel/admin/configuration/communicationType.models.ts b/src/viewmodel/admin/settings/communicationType.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/communicationType.models.ts rename to src/viewmodel/admin/settings/communicationType.models.ts diff --git a/src/viewmodel/admin/configuration/executivePosition.models.ts b/src/viewmodel/admin/settings/executivePosition.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/executivePosition.models.ts rename to src/viewmodel/admin/settings/executivePosition.models.ts diff --git a/src/viewmodel/admin/configuration/membershipStatus.models.ts b/src/viewmodel/admin/settings/membershipStatus.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/membershipStatus.models.ts rename to src/viewmodel/admin/settings/membershipStatus.models.ts diff --git a/src/viewmodel/admin/configuration/newsletterConfig.models.ts b/src/viewmodel/admin/settings/newsletterConfig.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/newsletterConfig.models.ts rename to src/viewmodel/admin/settings/newsletterConfig.models.ts diff --git a/src/viewmodel/admin/configuration/qualification.models.ts b/src/viewmodel/admin/settings/qualification.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/qualification.models.ts rename to src/viewmodel/admin/settings/qualification.models.ts diff --git a/src/viewmodel/admin/configuration/queryStore.models.ts b/src/viewmodel/admin/settings/queryStore.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/queryStore.models.ts rename to src/viewmodel/admin/settings/queryStore.models.ts diff --git a/src/viewmodel/admin/configuration/salutation.models.ts b/src/viewmodel/admin/settings/salutation.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/salutation.models.ts rename to src/viewmodel/admin/settings/salutation.models.ts diff --git a/src/viewmodel/admin/configuration/template.models.ts b/src/viewmodel/admin/settings/template.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/template.models.ts rename to src/viewmodel/admin/settings/template.models.ts diff --git a/src/viewmodel/admin/configuration/templateUsage.models.ts b/src/viewmodel/admin/settings/templateUsage.models.ts similarity index 100% rename from src/viewmodel/admin/configuration/templateUsage.models.ts rename to src/viewmodel/admin/settings/templateUsage.models.ts diff --git a/src/viewmodel/admin/management/invite.models.ts b/src/viewmodel/admin/user/invite.models.ts similarity index 100% rename from src/viewmodel/admin/management/invite.models.ts rename to src/viewmodel/admin/user/invite.models.ts diff --git a/src/viewmodel/admin/management/role.models.ts b/src/viewmodel/admin/user/role.models.ts similarity index 100% rename from src/viewmodel/admin/management/role.models.ts rename to src/viewmodel/admin/user/role.models.ts diff --git a/src/viewmodel/admin/management/user.models.ts b/src/viewmodel/admin/user/user.models.ts similarity index 100% rename from src/viewmodel/admin/management/user.models.ts rename to src/viewmodel/admin/user/user.models.ts diff --git a/src/viewmodel/admin/management/webapi.models.ts b/src/viewmodel/admin/user/webapi.models.ts similarity index 100% rename from src/viewmodel/admin/management/webapi.models.ts rename to src/viewmodel/admin/user/webapi.models.ts