change user to uuid
This commit is contained in:
parent
07f8e2dbcb
commit
f89483f878
46 changed files with 146 additions and 151 deletions
|
@ -9,7 +9,7 @@ export interface CreateCommunicationCommand {
|
|||
street: string;
|
||||
streetNumber: number;
|
||||
streetNumberAddition: string;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
typeId: number;
|
||||
}
|
||||
|
||||
|
@ -25,10 +25,10 @@ export interface UpdateCommunicationCommand {
|
|||
street: string;
|
||||
streetNumber: number;
|
||||
streetNumberAddition: string;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
}
|
||||
|
||||
export interface DeleteCommunicationCommand {
|
||||
id: number;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@ export interface CreateMemberAwardCommand {
|
|||
given: boolean;
|
||||
note?: string;
|
||||
date: Date;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
awardId: number;
|
||||
}
|
||||
|
||||
|
@ -11,11 +11,11 @@ export interface UpdateMemberAwardCommand {
|
|||
given: boolean;
|
||||
note?: string;
|
||||
date: Date;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
awardId: number;
|
||||
}
|
||||
|
||||
export interface DeleteMemberAwardCommand {
|
||||
id: number;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ export interface CreateMemberCommand {
|
|||
}
|
||||
|
||||
export interface UpdateMemberCommand {
|
||||
id: number;
|
||||
id: string;
|
||||
salutationId: number;
|
||||
firstname: string;
|
||||
lastname: string;
|
||||
|
@ -18,5 +18,5 @@ export interface UpdateMemberCommand {
|
|||
}
|
||||
|
||||
export interface DeleteMemberCommand {
|
||||
id: number;
|
||||
id: string;
|
||||
}
|
||||
|
|
|
@ -2,7 +2,7 @@ export interface CreateMemberExecutivePositionCommand {
|
|||
note?: string;
|
||||
start: Date;
|
||||
end?: Date;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
executivePositionId: number;
|
||||
}
|
||||
|
||||
|
@ -11,11 +11,11 @@ export interface UpdateMemberExecutivePositionCommand {
|
|||
note?: string;
|
||||
start: Date;
|
||||
end?: Date;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
executivePositionId: number;
|
||||
}
|
||||
|
||||
export interface DeleteMemberExecutivePositionCommand {
|
||||
id: number;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
export interface CreateMemberQualificationCommand {
|
||||
note?: string;
|
||||
start: Date;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
qualificationId: number;
|
||||
}
|
||||
|
||||
|
@ -11,11 +11,11 @@ export interface UpdateMemberQualificationCommand {
|
|||
start: Date;
|
||||
end?: Date;
|
||||
terminationReason?: string;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
qualificationId: number;
|
||||
}
|
||||
|
||||
export interface DeleteMemberQualificationCommand {
|
||||
id: number;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
export interface CreateMembershipCommand {
|
||||
start: Date;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
statusId: number;
|
||||
}
|
||||
|
||||
|
@ -9,11 +9,11 @@ export interface UpdateMembershipCommand {
|
|||
start: Date;
|
||||
end?: Date;
|
||||
terminationReason?: string;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
statusId: number;
|
||||
}
|
||||
|
||||
export interface DeleteMembershipCommand {
|
||||
id: number;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
export interface SynchronizeNewsletterRecipientsCommand {
|
||||
newsletterId: number;
|
||||
recipients: Array<number>;
|
||||
recipients: Array<string>;
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ export default abstract class NewsletterRecipientsCommandHandler {
|
|||
private static async syncPresenceAdd(
|
||||
manager: EntityManager,
|
||||
newsletterId: number,
|
||||
recipients: Array<number>
|
||||
recipients: Array<string>
|
||||
): Promise<InsertResult> {
|
||||
return await manager
|
||||
.createQueryBuilder()
|
||||
|
@ -60,7 +60,7 @@ export default abstract class NewsletterRecipientsCommandHandler {
|
|||
private static async syncPresenceRemove(
|
||||
manager: EntityManager,
|
||||
newsletterId: number,
|
||||
recipients: Array<number>
|
||||
recipients: Array<string>
|
||||
): Promise<DeleteResult> {
|
||||
return await manager
|
||||
.createQueryBuilder()
|
||||
|
|
|
@ -4,7 +4,7 @@ export interface SynchronizeProtocolPresenceCommand {
|
|||
}
|
||||
|
||||
export interface ProtocolPresenceCommand {
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
absent: boolean;
|
||||
excused: boolean;
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
export interface CreateRefreshCommand {
|
||||
userId: number;
|
||||
userId: string;
|
||||
isFromPwa?: boolean;
|
||||
}
|
||||
|
||||
export interface DeleteRefreshCommand {
|
||||
token: string;
|
||||
userId: number;
|
||||
userId: string;
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ export interface CreateUserCommand {
|
|||
}
|
||||
|
||||
export interface UpdateUserCommand {
|
||||
id: number;
|
||||
id: string;
|
||||
mail: string;
|
||||
username: string;
|
||||
firstname: string;
|
||||
|
@ -16,20 +16,20 @@ export interface UpdateUserCommand {
|
|||
}
|
||||
|
||||
export interface UpdateUserSecretCommand {
|
||||
id: number;
|
||||
id: string;
|
||||
secret: string;
|
||||
}
|
||||
|
||||
export interface TransferUserOwnerCommand {
|
||||
fromId: number;
|
||||
toId: number;
|
||||
fromId: string;
|
||||
toId: string;
|
||||
}
|
||||
|
||||
export interface UpdateUserRolesCommand {
|
||||
id: number;
|
||||
id: string;
|
||||
roleIds: Array<number>;
|
||||
}
|
||||
|
||||
export interface DeleteUserCommand {
|
||||
id: number;
|
||||
id: string;
|
||||
}
|
||||
|
|
|
@ -16,9 +16,9 @@ export default abstract class UserCommandHandler {
|
|||
/**
|
||||
* @description create user
|
||||
* @param {CreateUserCommand} createUser
|
||||
* @returns {Promise<number>}
|
||||
* @returns {Promise<string>}
|
||||
*/
|
||||
static async create(createUser: CreateUserCommand): Promise<number> {
|
||||
static async create(createUser: CreateUserCommand): Promise<string> {
|
||||
return await dataSource
|
||||
.createQueryBuilder()
|
||||
.insert()
|
||||
|
@ -109,11 +109,11 @@ export default abstract class UserCommandHandler {
|
|||
});
|
||||
}
|
||||
|
||||
private static async updateRolesAdd(manager: EntityManager, userId: number, roleId: number): Promise<void> {
|
||||
private static async updateRolesAdd(manager: EntityManager, userId: string, roleId: number): Promise<void> {
|
||||
return await manager.createQueryBuilder().relation(user, "roles").of(userId).add(roleId);
|
||||
}
|
||||
|
||||
private static async updateRolesRemove(manager: EntityManager, userId: number, roleId: number): Promise<void> {
|
||||
private static async updateRolesRemove(manager: EntityManager, userId: string, roleId: number): Promise<void> {
|
||||
return await manager.createQueryBuilder().relation(user, "roles").of(userId).remove(roleId);
|
||||
}
|
||||
|
||||
|
|
|
@ -2,15 +2,15 @@ import { PermissionString } from "../../../type/permissionTypes";
|
|||
|
||||
export interface CreateUserPermissionCommand {
|
||||
permission: PermissionString;
|
||||
userId: number;
|
||||
userId: string;
|
||||
}
|
||||
|
||||
export interface DeleteUserPermissionCommand {
|
||||
permission: PermissionString;
|
||||
userId: number;
|
||||
userId: string;
|
||||
}
|
||||
|
||||
export interface UpdateUserPermissionsCommand {
|
||||
userId: number;
|
||||
userId: string;
|
||||
permissions: Array<PermissionString>;
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ export default abstract class UserPermissionCommandHandler {
|
|||
|
||||
private static async updatePermissionsAdd(
|
||||
manager: EntityManager,
|
||||
userId: number,
|
||||
userId: string,
|
||||
permissions: Array<PermissionString>
|
||||
): Promise<InsertResult> {
|
||||
return await manager
|
||||
|
@ -61,7 +61,7 @@ export default abstract class UserPermissionCommandHandler {
|
|||
|
||||
private static async updatePermissionsRemove(
|
||||
manager: EntityManager,
|
||||
userId: number,
|
||||
userId: string,
|
||||
permissions: Array<PermissionString>
|
||||
): Promise<DeleteResult> {
|
||||
return await manager
|
||||
|
|
|
@ -61,10 +61,7 @@ export async function getAllMembers(req: Request, res: Response): Promise<any> {
|
|||
let count = parseInt((req.query.count as string) ?? "25");
|
||||
let search = (req.query.search as string) ?? "";
|
||||
let noLimit = req.query.noLimit === "true";
|
||||
let ids = ((req.query.ids ?? "") as string)
|
||||
.split(",")
|
||||
.filter((i) => i)
|
||||
.map((i) => parseInt(i));
|
||||
let ids = ((req.query.ids ?? "") as string).split(",").filter((i) => i);
|
||||
|
||||
let [members, total] = await MemberService.getAll({ offset, count, search, noLimit, ids });
|
||||
|
||||
|
@ -83,7 +80,7 @@ export async function getAllMembers(req: Request, res: Response): Promise<any> {
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getMemberById(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.id);
|
||||
const memberId = req.params.id;
|
||||
let member = await MemberService.getById(memberId);
|
||||
|
||||
res.json(MemberFactory.mapToSingle(member));
|
||||
|
@ -96,7 +93,7 @@ export async function getMemberById(req: Request, res: Response): Promise<any> {
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getMemberStatisticsById(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.id);
|
||||
const memberId = req.params.id;
|
||||
let member = await MemberService.getStatisticsById(memberId);
|
||||
|
||||
res.json(MemberFactory.mapToMemberStatistic(member));
|
||||
|
@ -109,7 +106,7 @@ export async function getMemberStatisticsById(req: Request, res: Response): Prom
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getMembershipsByMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
let memberships = await MembershipService.getAll(memberId);
|
||||
|
||||
res.json(MembershipFactory.mapToBase(memberships));
|
||||
|
@ -122,7 +119,7 @@ export async function getMembershipsByMember(req: Request, res: Response): Promi
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getMembershipStatisticsById(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
let member = await MembershipService.getStatisticsById(memberId);
|
||||
|
||||
res.json(MembershipFactory.mapToBaseStatistics(member));
|
||||
|
@ -135,7 +132,7 @@ export async function getMembershipStatisticsById(req: Request, res: Response):
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getMembershipByMemberAndRecord(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.id);
|
||||
let membership = await MembershipService.getById(memberId, recordId);
|
||||
|
||||
|
@ -149,7 +146,7 @@ export async function getMembershipByMemberAndRecord(req: Request, res: Response
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getAwardsByMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
let awards = await MemberAwardService.getAll(memberId);
|
||||
|
||||
res.json(MemberAwardFactory.mapToBase(awards));
|
||||
|
@ -162,7 +159,7 @@ export async function getAwardsByMember(req: Request, res: Response): Promise<an
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getAwardByMemberAndRecord(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.id);
|
||||
let award = await MemberAwardService.getById(memberId, recordId);
|
||||
|
||||
|
@ -176,7 +173,7 @@ export async function getAwardByMemberAndRecord(req: Request, res: Response): Pr
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getQualificationsByMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
let qualifications = await MemberQualificationService.getAll(memberId);
|
||||
|
||||
res.json(MemberQualificationFactory.mapToBase(qualifications));
|
||||
|
@ -189,7 +186,7 @@ export async function getQualificationsByMember(req: Request, res: Response): Pr
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getQualificationByMemberAndRecord(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.id);
|
||||
let qualification = await MemberQualificationService.getById(memberId, recordId);
|
||||
|
||||
|
@ -203,7 +200,7 @@ export async function getQualificationByMemberAndRecord(req: Request, res: Respo
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getExecutivePositionsByMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
let positions = await MemberExecutivePositionService.getAll(memberId);
|
||||
|
||||
res.json(MemberExecutivePositionFactory.mapToBase(positions));
|
||||
|
@ -216,7 +213,7 @@ export async function getExecutivePositionsByMember(req: Request, res: Response)
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getExecutivePositionByMemberAndRecord(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.id);
|
||||
let position = await MemberExecutivePositionService.getById(memberId, recordId);
|
||||
|
||||
|
@ -230,7 +227,7 @@ export async function getExecutivePositionByMemberAndRecord(req: Request, res: R
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getCommunicationsByMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
let communications = await CommunicationService.getAll(memberId);
|
||||
|
||||
res.json(CommunicationFactory.mapToBase(communications));
|
||||
|
@ -243,7 +240,7 @@ export async function getCommunicationsByMember(req: Request, res: Response): Pr
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getCommunicationByMemberAndRecord(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.id);
|
||||
let communication = await CommunicationService.getById(memberId, recordId);
|
||||
|
||||
|
@ -311,7 +308,7 @@ export async function createMember(req: Request, res: Response): Promise<any> {
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function addMembershipToMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const start = req.body.start;
|
||||
const statusId = req.body.statusId;
|
||||
|
||||
|
@ -332,7 +329,7 @@ export async function addMembershipToMember(req: Request, res: Response): Promis
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function addAwardToMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const given = req.body.given;
|
||||
const note = req.body.note;
|
||||
const date = req.body.date;
|
||||
|
@ -357,7 +354,7 @@ export async function addAwardToMember(req: Request, res: Response): Promise<any
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function addQualificationToMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const note = req.body.note;
|
||||
const start = req.body.start;
|
||||
const qualificationId = req.body.qualificationId;
|
||||
|
@ -380,7 +377,7 @@ export async function addQualificationToMember(req: Request, res: Response): Pro
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function addExecutivePositionToMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const note = req.body.note;
|
||||
const start = req.body.start;
|
||||
const end = req.body.end || null;
|
||||
|
@ -405,7 +402,7 @@ export async function addExecutivePositionToMember(req: Request, res: Response):
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function addCommunicationToMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const preferred = req.body.preferred;
|
||||
const isSMSAlarming = req.body.isSMSAlarming;
|
||||
const isSendNewsletter = req.body.isNewsletterMain;
|
||||
|
@ -444,7 +441,7 @@ export async function addCommunicationToMember(req: Request, res: Response): Pro
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function updateMemberById(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.id);
|
||||
const memberId = req.params.id;
|
||||
const salutationId = parseInt(req.body.salutationId);
|
||||
const firstname = req.body.firstname;
|
||||
const lastname = req.body.lastname;
|
||||
|
@ -473,7 +470,7 @@ export async function updateMemberById(req: Request, res: Response): Promise<any
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function updateMembershipOfMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.recordId);
|
||||
const start = req.body.start;
|
||||
const end = req.body.end || null;
|
||||
|
@ -500,7 +497,7 @@ export async function updateMembershipOfMember(req: Request, res: Response): Pro
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function updateAwardOfMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.recordId);
|
||||
const given = req.body.given;
|
||||
const note = req.body.note;
|
||||
|
@ -527,7 +524,7 @@ export async function updateAwardOfMember(req: Request, res: Response): Promise<
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function updateQualificationOfMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.recordId);
|
||||
const note = req.body.note;
|
||||
const start = req.body.start;
|
||||
|
@ -556,7 +553,7 @@ export async function updateQualificationOfMember(req: Request, res: Response):
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function updateExecutivePositionOfMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.recordId);
|
||||
const note = req.body.note;
|
||||
const start = req.body.start;
|
||||
|
@ -583,7 +580,7 @@ export async function updateExecutivePositionOfMember(req: Request, res: Respons
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function updateCommunicationOfMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.recordId);
|
||||
const preferred = req.body.preferred;
|
||||
const isSMSAlarming = req.body.isSMSAlarming;
|
||||
|
@ -622,7 +619,7 @@ export async function updateCommunicationOfMember(req: Request, res: Response):
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function deleteMemberById(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.id);
|
||||
const memberId = req.params.id;
|
||||
|
||||
let deleteMember: DeleteMemberCommand = {
|
||||
id: memberId,
|
||||
|
@ -639,7 +636,7 @@ export async function deleteMemberById(req: Request, res: Response): Promise<any
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function deleteMembershipOfMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.recordId);
|
||||
|
||||
let deleteMembership: DeleteMembershipCommand = {
|
||||
|
@ -658,7 +655,7 @@ export async function deleteMembershipOfMember(req: Request, res: Response): Pro
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function deleteAwardOfMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.recordId);
|
||||
|
||||
let deleteMemberAward: DeleteMemberAwardCommand = {
|
||||
|
@ -677,7 +674,7 @@ export async function deleteAwardOfMember(req: Request, res: Response): Promise<
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function deleteQualificationOfMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.recordId);
|
||||
|
||||
let deleteMemberQualification: DeleteMemberQualificationCommand = {
|
||||
|
@ -696,7 +693,7 @@ export async function deleteQualificationOfMember(req: Request, res: Response):
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function deleteExecutivePositionOfMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.recordId);
|
||||
|
||||
let deleteMemberExecutivePosition: DeleteMemberExecutivePositionCommand = {
|
||||
|
@ -715,7 +712,7 @@ export async function deleteExecutivePositionOfMember(req: Request, res: Respons
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function deleteCommunicationOfMember(req: Request, res: Response): Promise<any> {
|
||||
const memberId = parseInt(req.params.memberId);
|
||||
const memberId = req.params.memberId;
|
||||
const recordId = parseInt(req.params.recordId);
|
||||
|
||||
let deleteCommunication: DeleteCommunicationCommand = {
|
||||
|
|
|
@ -135,7 +135,7 @@ export async function createNewsletterPrintoutPreviewById(req: Request, res: Res
|
|||
let newsletterId = parseInt(req.params.newsletterId);
|
||||
let newsletter = await NewsletterService.getById(newsletterId);
|
||||
let dates = await NewsletterDatesService.getAll(newsletterId);
|
||||
let recipient = await UserService.getById(parseInt(req.userId));
|
||||
let recipient = await UserService.getById(req.userId);
|
||||
|
||||
let data = NewsletterHelper.buildData(newsletter, dates);
|
||||
data.recipient = {
|
||||
|
@ -241,7 +241,7 @@ export async function createNewsletterMailPreviewById(req: Request, res: Respons
|
|||
let newsletterId = parseInt(req.params.newsletterId);
|
||||
let newsletter = await NewsletterService.getById(newsletterId);
|
||||
let dates = await NewsletterDatesService.getAll(newsletterId);
|
||||
let recipient = await UserService.getById(parseInt(req.userId));
|
||||
let recipient = await UserService.getById(req.userId);
|
||||
|
||||
let data = NewsletterHelper.buildData(newsletter, dates);
|
||||
data.recipient = {
|
||||
|
@ -375,7 +375,7 @@ export async function synchronizeNewsletterDatesById(req: Request, res: Response
|
|||
*/
|
||||
export async function synchronizeNewsletterRecipientsById(req: Request, res: Response): Promise<any> {
|
||||
let newsletterId = parseInt(req.params.newsletterId);
|
||||
let recipients = req.body.recipients as Array<number>;
|
||||
let recipients = req.body.recipients as Array<string>;
|
||||
|
||||
let syncRecipients: SynchronizeNewsletterRecipientsCommand = {
|
||||
newsletterId,
|
||||
|
|
|
@ -31,7 +31,7 @@ export async function getAllUsers(req: Request, res: Response): Promise<any> {
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getUserById(req: Request, res: Response): Promise<any> {
|
||||
const id = parseInt(req.params.id);
|
||||
const id = req.params.id;
|
||||
let user = await UserService.getById(id);
|
||||
|
||||
res.json(UserFactory.mapToSingle(user));
|
||||
|
@ -44,7 +44,7 @@ export async function getUserById(req: Request, res: Response): Promise<any> {
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getUserPermissions(req: Request, res: Response): Promise<any> {
|
||||
const id = parseInt(req.params.id);
|
||||
const id = req.params.id;
|
||||
let permissions = await UserPermissionService.getByUser(id);
|
||||
|
||||
res.json(PermissionHelper.convertToObject(permissions.map((p) => p.permission)));
|
||||
|
@ -57,7 +57,7 @@ export async function getUserPermissions(req: Request, res: Response): Promise<a
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getUserRoles(req: Request, res: Response): Promise<any> {
|
||||
const id = parseInt(req.params.id);
|
||||
const id = req.params.id;
|
||||
|
||||
let roles = await UserService.getAssignedRolesByUserId(id);
|
||||
|
||||
|
@ -71,7 +71,7 @@ export async function getUserRoles(req: Request, res: Response): Promise<any> {
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function updateUser(req: Request, res: Response): Promise<any> {
|
||||
const id = parseInt(req.params.id);
|
||||
const id = req.params.id;
|
||||
let mail = req.body.mail;
|
||||
let firstname = req.body.firstname;
|
||||
let lastname = req.body.lastname;
|
||||
|
@ -96,7 +96,7 @@ export async function updateUser(req: Request, res: Response): Promise<any> {
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function updateUserPermissions(req: Request, res: Response): Promise<any> {
|
||||
const id = parseInt(req.params.id);
|
||||
const id = req.params.id;
|
||||
let permissions = req.body.permissions;
|
||||
|
||||
let permissionStrings = PermissionHelper.convertToStringArray(permissions);
|
||||
|
@ -117,7 +117,7 @@ export async function updateUserPermissions(req: Request, res: Response): Promis
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function updateUserRoles(req: Request, res: Response): Promise<any> {
|
||||
const id = parseInt(req.params.id);
|
||||
const id = req.params.id;
|
||||
let roleIds = req.body.roleIds as Array<number>;
|
||||
|
||||
let updateRoles: UpdateUserRolesCommand = {
|
||||
|
@ -136,7 +136,7 @@ export async function updateUserRoles(req: Request, res: Response): Promise<any>
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function deleteUser(req: Request, res: Response): Promise<any> {
|
||||
const id = parseInt(req.params.id);
|
||||
const id = req.params.id;
|
||||
|
||||
let { mail, isOwner } = await UserService.getById(id);
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ import ForbiddenRequestException from "../exceptions/forbiddenRequestException";
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getMeById(req: Request, res: Response): Promise<any> {
|
||||
const id = parseInt(req.userId);
|
||||
const id = req.userId;
|
||||
let user = await UserService.getById(id);
|
||||
|
||||
res.json(UserFactory.mapToSingle(user));
|
||||
|
@ -29,7 +29,7 @@ export async function getMeById(req: Request, res: Response): Promise<any> {
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function getMyTotp(req: Request, res: Response): Promise<any> {
|
||||
const userId = parseInt(req.userId);
|
||||
const userId = req.userId;
|
||||
|
||||
let { secret } = await UserService.getById(userId);
|
||||
|
||||
|
@ -54,7 +54,7 @@ export async function getMyTotp(req: Request, res: Response): Promise<any> {
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function verifyMyTotp(req: Request, res: Response): Promise<any> {
|
||||
const userId = parseInt(req.userId);
|
||||
const userId = req.userId;
|
||||
let totp = req.body.totp;
|
||||
|
||||
let { secret } = await UserService.getById(userId);
|
||||
|
@ -78,7 +78,7 @@ export async function verifyMyTotp(req: Request, res: Response): Promise<any> {
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function transferOwnership(req: Request, res: Response): Promise<any> {
|
||||
const userId = parseInt(req.userId);
|
||||
const userId = req.userId;
|
||||
let toId = req.body.toId;
|
||||
|
||||
let { isOwner } = await UserService.getById(userId);
|
||||
|
@ -102,7 +102,7 @@ export async function transferOwnership(req: Request, res: Response): Promise<an
|
|||
* @returns {Promise<*>}
|
||||
*/
|
||||
export async function updateMe(req: Request, res: Response): Promise<any> {
|
||||
const id = parseInt(req.userId);
|
||||
const id = req.userId;
|
||||
let mail = req.body.mail;
|
||||
let firstname = req.body.firstname;
|
||||
let lastname = req.body.lastname;
|
||||
|
|
|
@ -38,7 +38,7 @@ export class communication {
|
|||
streetNumberAddition: string;
|
||||
|
||||
@Column()
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
|
||||
@Column()
|
||||
typeId: number;
|
||||
|
|
|
@ -8,8 +8,8 @@ import { salutation } from "../../settings/salutation";
|
|||
|
||||
@Entity()
|
||||
export class member {
|
||||
@PrimaryColumn({ generated: "increment", type: "int" })
|
||||
id: number;
|
||||
@PrimaryColumn({ generated: "uuid", type: "varchar" })
|
||||
id: string;
|
||||
|
||||
@Column({ type: "varchar", length: 255 })
|
||||
firstname: string;
|
||||
|
|
|
@ -17,7 +17,7 @@ export class memberAwards {
|
|||
date: Date;
|
||||
|
||||
@Column()
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
|
||||
@Column()
|
||||
awardId: number;
|
||||
|
|
|
@ -17,7 +17,7 @@ export class memberExecutivePositions {
|
|||
end?: Date;
|
||||
|
||||
@Column()
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
|
||||
@Column()
|
||||
executivePositionId: number;
|
||||
|
|
|
@ -20,7 +20,7 @@ export class memberQualifications {
|
|||
terminationReason?: string;
|
||||
|
||||
@Column()
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
|
||||
@Column()
|
||||
qualificationId: number;
|
||||
|
|
|
@ -17,7 +17,7 @@ export class membership {
|
|||
terminationReason?: string;
|
||||
|
||||
@Column()
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
|
||||
@Column()
|
||||
statusId: number;
|
||||
|
|
|
@ -4,11 +4,11 @@ import { member } from "../member/member";
|
|||
|
||||
@Entity()
|
||||
export class newsletterRecipients {
|
||||
@PrimaryColumn({ type: "int" })
|
||||
@PrimaryColumn()
|
||||
newsletterId: number;
|
||||
|
||||
@PrimaryColumn({ type: "int" })
|
||||
memberId: number;
|
||||
@PrimaryColumn()
|
||||
memberId: string;
|
||||
|
||||
@ManyToOne(() => newsletter, (newsletter) => newsletter.recipients, {
|
||||
nullable: false,
|
||||
|
|
|
@ -5,7 +5,7 @@ import { member } from "../member/member";
|
|||
@Entity()
|
||||
export class protocolPresence {
|
||||
@PrimaryColumn()
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
|
||||
@PrimaryColumn()
|
||||
protocolId: number;
|
||||
|
|
|
@ -50,7 +50,7 @@ export abstract class JWTHelper {
|
|||
});
|
||||
}
|
||||
|
||||
static async buildToken(id: number): Promise<string> {
|
||||
static async buildToken(id: string): Promise<string> {
|
||||
let { firstname, lastname, mail, username, isOwner } = await UserService.getById(id);
|
||||
let userPermissions = await UserPermissionService.getByUser(id);
|
||||
let userPermissionStrings = userPermissions.map((e) => e.permission);
|
||||
|
@ -86,7 +86,7 @@ export abstract class JWTHelper {
|
|||
let permissionObject = PermissionHelper.convertToObject(webapiPermissionStrings);
|
||||
|
||||
let jwtData: JWTToken = {
|
||||
userId: id,
|
||||
userId: id.toString(),
|
||||
mail: "",
|
||||
username: title,
|
||||
firstname: "",
|
||||
|
|
|
@ -121,7 +121,7 @@ export abstract class NewsletterHelper {
|
|||
): Promise<Array<member>> {
|
||||
let useQuery = newsletter.recipientsByQuery?.query;
|
||||
|
||||
let queryMemberIds: Array<number> = [];
|
||||
let queryMemberIds: Array<string> = [];
|
||||
if (useQuery) {
|
||||
let result = await DynamicQueryBuilder.executeQuery(
|
||||
useQuery.startsWith("{") ? JSON.parse(useQuery) : useQuery,
|
||||
|
@ -131,7 +131,7 @@ export abstract class NewsletterHelper {
|
|||
if (result.stats == "success") {
|
||||
let keys = Object.keys(result.rows?.[0] ?? {});
|
||||
let memberKey = keys.find((k) => k.includes("member_id"));
|
||||
queryMemberIds = result.rows.map((t) => parseInt((t[memberKey] ?? t.id) as string));
|
||||
queryMemberIds = result.rows.map((t) => (t[memberKey] ?? t.id) as string);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -253,7 +253,7 @@ export abstract class NewsletterHelper {
|
|||
|
||||
for (const [index, rec] of [
|
||||
...pdfRecipients,
|
||||
{ id: 0, firstname: "Alle Mitglieder", lastname: CLUB_NAME } as member,
|
||||
{ id: "0", firstname: "Alle Mitglieder", lastname: CLUB_NAME } as member,
|
||||
].entries()) {
|
||||
let data = this.buildData(newsletter, dates, rec, printWithAdress.includes(rec.sendNewsletter?.type?.id));
|
||||
|
||||
|
|
|
@ -5,10 +5,10 @@ import InternalException from "../../../exceptions/internalException";
|
|||
export default abstract class CommunicationService {
|
||||
/**
|
||||
* @description get all by member id
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @returns {Promise<Array<communication>>}
|
||||
*/
|
||||
static async getAll(memberId: number): Promise<Array<communication>> {
|
||||
static async getAll(memberId: string): Promise<Array<communication>> {
|
||||
return await dataSource
|
||||
.getRepository(communication)
|
||||
.createQueryBuilder("communication")
|
||||
|
@ -27,11 +27,11 @@ export default abstract class CommunicationService {
|
|||
|
||||
/**
|
||||
* @description get all by memberId and recordId
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @param {number} recordId
|
||||
* @returns {Promise<communication>}
|
||||
*/
|
||||
static async getById(memberId: number, recordId: number): Promise<communication> {
|
||||
static async getById(memberId: string, recordId: number): Promise<communication> {
|
||||
return await dataSource
|
||||
.getRepository(communication)
|
||||
.createQueryBuilder("communication")
|
||||
|
|
|
@ -5,10 +5,10 @@ import InternalException from "../../../exceptions/internalException";
|
|||
export default abstract class MemberAwardService {
|
||||
/**
|
||||
* @description get all by member id
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @returns {Promise<Array<memberAwards>>}
|
||||
*/
|
||||
static async getAll(memberId: number): Promise<Array<memberAwards>> {
|
||||
static async getAll(memberId: string): Promise<Array<memberAwards>> {
|
||||
return await dataSource
|
||||
.getRepository(memberAwards)
|
||||
.createQueryBuilder("memberAwards")
|
||||
|
@ -26,11 +26,11 @@ export default abstract class MemberAwardService {
|
|||
|
||||
/**
|
||||
* @description get by memberId and recordId
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @param {number} recordId
|
||||
* @returns {Promise<Array<member>>}
|
||||
*/
|
||||
static async getById(memberId: number, recordId: number): Promise<memberAwards> {
|
||||
static async getById(memberId: string, recordId: number): Promise<memberAwards> {
|
||||
return await dataSource
|
||||
.getRepository(memberAwards)
|
||||
.createQueryBuilder("memberAwards")
|
||||
|
|
|
@ -5,10 +5,10 @@ import InternalException from "../../../exceptions/internalException";
|
|||
export default abstract class MemberExecutivePositionService {
|
||||
/**
|
||||
* @description get all by member id
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @returns {Promise<Array<memberExecutivePositions>>}
|
||||
*/
|
||||
static async getAll(memberId: number): Promise<Array<memberExecutivePositions>> {
|
||||
static async getAll(memberId: string): Promise<Array<memberExecutivePositions>> {
|
||||
return await dataSource
|
||||
.getRepository(memberExecutivePositions)
|
||||
.createQueryBuilder("memberExecutivePositions")
|
||||
|
@ -27,11 +27,11 @@ export default abstract class MemberExecutivePositionService {
|
|||
|
||||
/**
|
||||
* @description get by memberId and recordId
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @param {number} recordId
|
||||
* @returns {Promise<Array<member>>}
|
||||
*/
|
||||
static async getById(memberId: number, recordId: number): Promise<memberExecutivePositions> {
|
||||
static async getById(memberId: string, recordId: number): Promise<memberExecutivePositions> {
|
||||
return await dataSource
|
||||
.getRepository(memberExecutivePositions)
|
||||
.createQueryBuilder("memberExecutivePositions")
|
||||
|
|
|
@ -5,10 +5,10 @@ import InternalException from "../../../exceptions/internalException";
|
|||
export default abstract class MemberQualificationService {
|
||||
/**
|
||||
* @description get all by member id
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @returns {Promise<Array<memberQualifications>>}
|
||||
*/
|
||||
static async getAll(memberId: number): Promise<Array<memberQualifications>> {
|
||||
static async getAll(memberId: string): Promise<Array<memberQualifications>> {
|
||||
return await dataSource
|
||||
.getRepository(memberQualifications)
|
||||
.createQueryBuilder("memberQualifications")
|
||||
|
@ -26,11 +26,11 @@ export default abstract class MemberQualificationService {
|
|||
|
||||
/**
|
||||
* @description get by memberId and recordId
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @param {number} recordId
|
||||
* @returns {Promise<Array<member>>}
|
||||
*/
|
||||
static async getById(memberId: number, recordId: number): Promise<memberQualifications> {
|
||||
static async getById(memberId: string, recordId: number): Promise<memberQualifications> {
|
||||
return await dataSource
|
||||
.getRepository(memberQualifications)
|
||||
.createQueryBuilder("memberQualifications")
|
||||
|
|
|
@ -20,7 +20,7 @@ export default abstract class MemberService {
|
|||
count?: number;
|
||||
search?: string;
|
||||
noLimit?: boolean;
|
||||
ids?: Array<number>;
|
||||
ids?: Array<string>;
|
||||
}): Promise<[Array<member>, number]> {
|
||||
let query = dataSource
|
||||
.getRepository(member)
|
||||
|
@ -96,10 +96,10 @@ export default abstract class MemberService {
|
|||
|
||||
/**
|
||||
* @description get member by id
|
||||
* @param {number} id
|
||||
* @param {string} id
|
||||
* @returns {Promise<member>}
|
||||
*/
|
||||
static async getById(id: number): Promise<member> {
|
||||
static async getById(id: string): Promise<member> {
|
||||
return await dataSource
|
||||
.getRepository(member)
|
||||
.createQueryBuilder("member")
|
||||
|
@ -146,10 +146,10 @@ export default abstract class MemberService {
|
|||
|
||||
/**
|
||||
* @description get member statistics by id
|
||||
* @param {number} id
|
||||
* @param {string} id
|
||||
* @returns {Promise<memberView>}
|
||||
*/
|
||||
static async getStatisticsById(id: number): Promise<memberView> {
|
||||
static async getStatisticsById(id: string): Promise<memberView> {
|
||||
return await dataSource
|
||||
.getRepository(memberView)
|
||||
.createQueryBuilder("memberView")
|
||||
|
@ -187,10 +187,10 @@ export default abstract class MemberService {
|
|||
|
||||
/**
|
||||
* @description get newsletter by member by id
|
||||
* @param {number} id
|
||||
* @param {string} id
|
||||
* @returns {Promise<member>}
|
||||
*/
|
||||
static async getNewsletterById(id: number): Promise<member> {
|
||||
static async getNewsletterById(id: string): Promise<member> {
|
||||
return await dataSource
|
||||
.getRepository(member)
|
||||
.createQueryBuilder("member")
|
||||
|
|
|
@ -6,10 +6,10 @@ import { membershipView } from "../../../views/membershipsView";
|
|||
export default abstract class MembershipService {
|
||||
/**
|
||||
* @description get all by member id
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @returns {Promise<Array<membership>>}
|
||||
*/
|
||||
static async getAll(memberId: number): Promise<Array<membership>> {
|
||||
static async getAll(memberId: string): Promise<Array<membership>> {
|
||||
return await dataSource
|
||||
.getRepository(membership)
|
||||
.createQueryBuilder("membership")
|
||||
|
@ -27,11 +27,11 @@ export default abstract class MembershipService {
|
|||
|
||||
/**
|
||||
* @description get by memberId and recordId
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @param {number} recordId
|
||||
* @returns {Promise<Array<member>>}
|
||||
*/
|
||||
static async getById(memberId: number, recordId: number): Promise<membership> {
|
||||
static async getById(memberId: string, recordId: number): Promise<membership> {
|
||||
return await dataSource
|
||||
.getRepository(membership)
|
||||
.createQueryBuilder("membership")
|
||||
|
@ -49,10 +49,10 @@ export default abstract class MembershipService {
|
|||
|
||||
/**
|
||||
* @description get membership statistics by memberId
|
||||
* @param {number} memberId
|
||||
* @param {string} memberId
|
||||
* @returns {Promise<Array<membershipView>>}
|
||||
*/
|
||||
static async getStatisticsById(memberId: number): Promise<Array<membershipView>> {
|
||||
static async getStatisticsById(memberId: string): Promise<Array<membershipView>> {
|
||||
return await dataSource
|
||||
.getRepository(membershipView)
|
||||
.createQueryBuilder("membershipView")
|
||||
|
|
|
@ -5,10 +5,10 @@ import InternalException from "../../exceptions/internalException";
|
|||
export default abstract class UserPermissionService {
|
||||
/**
|
||||
* @description get permission by user
|
||||
* @param userId number
|
||||
* @param userId string
|
||||
* @returns {Promise<Array<userPermission>>}
|
||||
*/
|
||||
static async getByUser(userId: number): Promise<Array<userPermission>> {
|
||||
static async getByUser(userId: string): Promise<Array<userPermission>> {
|
||||
return await dataSource
|
||||
.getRepository(userPermission)
|
||||
.createQueryBuilder("permission")
|
||||
|
|
|
@ -28,10 +28,10 @@ export default abstract class UserService {
|
|||
|
||||
/**
|
||||
* @description get user by id
|
||||
* @param id number
|
||||
* @param id string
|
||||
* @returns {Promise<user>}
|
||||
*/
|
||||
static async getById(id: number): Promise<user> {
|
||||
static async getById(id: string): Promise<user> {
|
||||
return await dataSource
|
||||
.getRepository(user)
|
||||
.createQueryBuilder("user")
|
||||
|
@ -110,10 +110,10 @@ export default abstract class UserService {
|
|||
|
||||
/**
|
||||
* @description get roles assigned to user
|
||||
* @param userId number
|
||||
* @param userId string
|
||||
* @returns {Promise<Array<role>>}
|
||||
*/
|
||||
static async getAssignedRolesByUserId(userId: number): Promise<Array<role>> {
|
||||
static async getAssignedRolesByUserId(userId: string): Promise<Array<role>> {
|
||||
return await dataSource
|
||||
.getRepository(user)
|
||||
.createQueryBuilder("user")
|
||||
|
|
|
@ -5,7 +5,7 @@ export type JWTData = {
|
|||
};
|
||||
|
||||
export type JWTToken = {
|
||||
userId: number;
|
||||
userId: string;
|
||||
mail: string;
|
||||
username: string;
|
||||
firstname: string;
|
||||
|
|
|
@ -3,7 +3,7 @@ import { CommunicationViewModel } from "./communication.models";
|
|||
import { MembershipViewModel } from "./membership.models";
|
||||
|
||||
export interface MemberViewModel {
|
||||
id: number;
|
||||
id: string;
|
||||
salutation: SalutationViewModel;
|
||||
firstname: string;
|
||||
lastname: string;
|
||||
|
@ -18,7 +18,7 @@ export interface MemberViewModel {
|
|||
}
|
||||
|
||||
export interface MemberStatisticsViewModel {
|
||||
id: number;
|
||||
id: string;
|
||||
salutation: string;
|
||||
firstname: string;
|
||||
lastname: string;
|
||||
|
|
|
@ -12,7 +12,7 @@ export interface MembershipStatisticsViewModel {
|
|||
durationInYears: string;
|
||||
status: string;
|
||||
statusId: number;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
memberSalutation: string;
|
||||
memberFirstname: string;
|
||||
memberLastname: string;
|
||||
|
|
|
@ -2,6 +2,6 @@ import { MemberViewModel } from "../member/member.models";
|
|||
|
||||
export interface NewsletterRecipientsViewModel {
|
||||
newsletterId: number;
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
member: MemberViewModel;
|
||||
}
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
import { MemberViewModel } from "../member/member.models";
|
||||
|
||||
export interface ProtocolPresenceViewModel {
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
absent: boolean;
|
||||
excused: boolean;
|
||||
protocolId: number;
|
||||
|
|
|
@ -2,7 +2,7 @@ import { PermissionObject } from "../../../type/permissionTypes";
|
|||
import { RoleViewModel } from "./role.models";
|
||||
|
||||
export interface UserViewModel {
|
||||
id: number;
|
||||
id: string;
|
||||
username: string;
|
||||
mail: string;
|
||||
firstname: string;
|
||||
|
|
|
@ -35,7 +35,7 @@ export class memberExecutivePositionsView {
|
|||
positionId: number;
|
||||
|
||||
@ViewColumn()
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
|
||||
@ViewColumn()
|
||||
memberSalutation: string;
|
||||
|
|
|
@ -35,7 +35,7 @@ export class memberQualificationsView {
|
|||
qualificationId: number;
|
||||
|
||||
@ViewColumn()
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
|
||||
@ViewColumn()
|
||||
memberSalutation: string;
|
||||
|
|
|
@ -19,7 +19,7 @@ import { member } from "../entity/club/member/member";
|
|||
})
|
||||
export class memberView {
|
||||
@ViewColumn()
|
||||
id: number;
|
||||
id: string;
|
||||
|
||||
@ViewColumn()
|
||||
salutation: string;
|
||||
|
|
|
@ -39,7 +39,7 @@ export class membershipView {
|
|||
statusId: number;
|
||||
|
||||
@ViewColumn()
|
||||
memberId: number;
|
||||
memberId: string;
|
||||
|
||||
@ViewColumn()
|
||||
memberSalutation: string;
|
||||
|
|
Loading…
Reference in a new issue