espe/backend
0
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

[mod] allow empty membership number

Browse source
This commit is contained in:
roydfalk 2024-05-27 18:12:15 +02:00
parent 553ced9038
commit 5457c6dd4d
6 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/api/actions/member_info.ts
View file

@ -32,7 +32,7 @@ namespace _espe.api
name_real_value : string; name_real_value : string;
name_real_index : int; name_real_index : int;
name_login : string; name_login : string;
email_address_veiled : string; email_address_veiled : (null | string);
email_address_nominal : string; email_address_nominal : string;
} }
) )
@ -65,7 +65,7 @@ namespace _espe.api
}, },
"email_address_veiled": { "email_address_veiled": {
"type": "string", "type": "string",
"nullable": false, "nullable": true,
}, },
"email_address_nominal": { "email_address_nominal": {
"type": "string", "type": "string",
@ -100,7 +100,7 @@ namespace _espe.api
name_real_value : string; name_real_value : string;
name_real_index : int; name_real_index : int;
name_login : string; name_login : string;
email_address_veiled : string; email_address_veiled : (null | string);
email_address_nominal : string; email_address_nominal : string;
} }
) = await _espe.service.member.info(member_id); ) = await _espe.service.member.info(member_id);

10
source/api/actions/member_project.ts
View file

@ -75,7 +75,15 @@ namespace _espe.api
{ {
"membership_number": input.membership_number, "membership_number": input.membership_number,
"name_real_value": input.name_real_value, "name_real_value": input.name_real_value,
"email_address_private": (input.email_address_private ?? null), "email_address_private": (
("email_address_private" in input)
? (
(input.email_address_private !== "")
? input.email_address_private
: null
)
: null
),
} }
); );
return Promise.resolve({ return Promise.resolve({

8
source/api/actions/member_read.ts
View file

@ -25,7 +25,7 @@ namespace _espe.api
register< register<
null, null,
{ {
membership_number : string; membership_number : (null | string);
name_real_value : string; name_real_value : string;
name_real_index : int; name_real_index : int;
email_address_private : (null | string); email_address_private : (null | string);
@ -36,7 +36,7 @@ namespace _espe.api
email_redirect_to_private_address : boolean; email_redirect_to_private_address : boolean;
email_allow_sending : boolean; email_allow_sending : boolean;
password_set : boolean; password_set : boolean;
email_address_veiled : string; email_address_veiled : (null | string);
email_address_nominal : string; email_address_nominal : string;
name_login : string; name_login : string;
} }
@ -51,7 +51,7 @@ namespace _espe.api
"type": "object", "type": "object",
"properties": { "properties": {
"membership_number": { "membership_number": {
"nullable": false, "nullable": true,
"type": "string" "type": "string"
}, },
"name_real_value": { "name_real_value": {
@ -95,7 +95,7 @@ namespace _espe.api
"type": "boolean" "type": "boolean"
}, },
"email_address_veiled": { "email_address_veiled": {
"nullable": false, "nullable": true,
"type": "string" "type": "string"
}, },
"email_address_nominal": { "email_address_nominal": {

2
source/database.ts
View file

@ -19,7 +19,7 @@ namespace _espe.database
/** /**
*/ */
const _compatible_revisions : Array<string> = [ const _compatible_revisions : Array<string> = [
"r3", "r4",
]; ];

22
source/services/member.ts
View file

@ -180,15 +180,19 @@ namespace _espe.service.member
*/ */
export function email_address_veiled( export function email_address_veiled(
object : _espe.type.member_object object : _espe.type.member_object
) : string ) : (null | string)
{ {
return lib_plankton.string.coin( return (
"{{prefix}}{{membership_number}}@{{domain}}", (object.membership_number === null)
{ ? null
"prefix": _espe.conf.get().settings.prefix_for_nominal_email_addresses, : lib_plankton.string.coin(
"membership_number": object.membership_number, "{{prefix}}{{membership_number}}@{{domain}}",
"domain": _espe.conf.get().settings.target_domain, {
} "prefix": _espe.conf.get().settings.prefix_for_nominal_email_addresses,
"membership_number": object.membership_number,
"domain": _espe.conf.get().settings.target_domain,
}
)
); );
} }
@ -385,7 +389,7 @@ namespace _espe.service.member
name_real_value : string; name_real_value : string;
name_real_index : int; name_real_index : int;
name_login : string; name_login : string;
email_address_veiled : string; email_address_veiled : (null | string);
email_address_nominal : string; email_address_nominal : string;
} }
) )

2
source/types.ts
View file

@ -24,7 +24,7 @@ namespace _espe.type
/** /**
*/ */
export type member_object = { export type member_object = {
membership_number : string; membership_number : (null | string);
name_real_value : string; name_real_value : string;
name_real_index : int; name_real_index : int;
email_address_private : (null | string); email_address_private : (null | string);