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

[int]

Browse source
This commit is contained in:
roydfalk 2025-08-22 10:52:52 +02:00
parent 0ab67447f3
commit 5eaf423747
21 changed files with 251 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
misc/sampledata.json
View file

@ -2,23 +2,28 @@
"groups": [ "groups": [
{ {
"id": 1, "id": 1,
"name": "Auto" "name": "auto",
"label": "Auto"
}, },
{ {
"id": 2, "id": 2,
"name": "Zug" "name": "zug",
"label": "Zug"
}, },
{ {
"id": 3, "id": 3,
"name": "Flugzeug" "name": "flugzeug",
"label": "Flugzeug"
}, },
{ {
"id": 4, "id": 4,
"name": "Fahrrad" "name": "fahrrad",
"label": "Fahrrad"
}, },
{ {
"id": 5, "id": 5,
"name": "zu Fuß" "name": "zu_fusz",
"label": "zu Fuß"
} }
], ],
"admins": [ "admins": [
@ -32,18 +37,21 @@
{ {
"id": 1, "id": 1,
"name": "alexandra", "name": "alexandra",
"label": "Alexandra Ahorn",
"email_address": "alex-rockt@example.org", "email_address": "alex-rockt@example.org",
"groups": [1, 2, 3] "groups": [1, 2, 3]
}, },
{ {
"id": 2, "id": 2,
"name": "berthold", "name": "berthold",
"label": "Berthold Buche",
"email_address": "bert-ohne-ernie@example.org", "email_address": "bert-ohne-ernie@example.org",
"groups": [4, 5, 2] "groups": [4, 5, 2]
}, },
{ {
"id": 3, "id": 3,
"name": "charlotte", "name": "charlotte",
"label": "Charlotte Castania",
"email_address": "charly-the-unicorn@example.org", "email_address": "charly-the-unicorn@example.org",
"groups": [4, 1] "groups": [4, 1]
} }
@ -51,8 +59,10 @@
"invitations": [ "invitations": [
{ {
"id": 1, "id": 1,
"name_changeable": true, "name_changeable": false,
"name_value": "daniel", "name_value": "daniel",
"label_changeable": true,
"label_value": "Daniel Distel",
"email_address_changeable": true, "email_address_changeable": true,
"email_address_value": "duesentrieb@example.org", "email_address_value": "duesentrieb@example.org",
"groups_changeable": false, "groups_changeable": false,

23
source/api/actions/group_add.ts
View file

@ -23,7 +23,10 @@ namespace _espe.api
) : void ) : void
{ {
lib_plankton.rest_http.register< lib_plankton.rest_http.register<
string, {
name : string;
label : string;
},
(string | _espe.type.group_id) (string | _espe.type.group_id)
>( >(
rest_subject, rest_subject,
@ -35,8 +38,23 @@ namespace _espe.api
*/ */
"description": () => "erstellt eine Gruppe", "description": () => "erstellt eine Gruppe",
"input_schema": () => ({ "input_schema": () => ({
"nullable": false,
"type": "object",
"properties": {
"name": {
"nullable": false, "nullable": false,
"type": "string", "type": "string",
},
"label": {
"nullable": false,
"type": "string",
},
},
"additionalProperties": false,
"required": [
"name",
"label",
],
}), }),
"output_schema": () => ({ "output_schema": () => ({
"nullable": false, "nullable": false,
@ -53,7 +71,8 @@ namespace _espe.api
else { else {
const data = await _espe.service.group.add( const data = await _espe.service.group.add(
{ {
"name": input "name": input["name"],
"label": input["label"]
} }
); );
return Promise.resolve({ return Promise.resolve({

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

@ -27,7 +27,10 @@ namespace _espe.api
Array< Array<
{ {
id : _espe.type.invitation_id; id : _espe.type.invitation_id;
preview : {
name : string; name : string;
label : string;
};
} }
> >
>( >(
@ -54,6 +57,11 @@ namespace _espe.api
"type": "string", "type": "string",
"description": "Name" "description": "Name"
}, },
"label": {
"nullable": false,
"type": "string",
"description": "Beschriftung"
},
}, },
"required": [ "required": [
"id", "id",
@ -65,7 +73,7 @@ namespace _espe.api
const data = await _espe.service.group.list(); const data = await _espe.service.group.list();
return Promise.resolve({ return Promise.resolve({
"status_code": 200, "status_code": 200,
"data": data "data": data,
}); });
} }
} }

13
source/api/actions/group_modify.ts
View file

@ -24,7 +24,7 @@ namespace _espe.api
{ {
lib_plankton.rest_http.register< lib_plankton.rest_http.register<
{ {
name : string; label : string;
}, },
null null
>( >(
@ -40,14 +40,14 @@ namespace _espe.api
"nullable": false, "nullable": false,
"type": "object", "type": "object",
"properties": { "properties": {
"name": { "label": {
"nullable": false, "nullable": false,
"type": "string", "type": "string",
} },
}, },
"additionalProperties": false, "additionalProperties": false,
"required": [ "required": [
"name", "label",
] ]
}), }),
"output_schema": () => ({ "output_schema": () => ({
@ -63,12 +63,9 @@ namespace _espe.api
} }
else { else {
const group_id : _espe.type.group_id = parseInt(path_parameters["id"]); const group_id : _espe.type.group_id = parseInt(path_parameters["id"]);
const group_object : _espe.type.group_object = {
"name": input.name,
};
const data = await _espe.service.group.modify( const data = await _espe.service.group.modify(
group_id, group_id,
group_object input["label"]
); );
return Promise.resolve({ return Promise.resolve({
"status_code": 200, "status_code": 200,

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

@ -26,6 +26,7 @@ namespace _espe.api
null, null,
{ {
name : string; name : string;
label : string;
} }
>( >(
rest_subject, rest_subject,
@ -43,11 +44,16 @@ namespace _espe.api
"name": { "name": {
"nullable": false, "nullable": false,
"type": "string", "type": "string",
} },
"label": {
"nullable": false,
"type": "string",
},
}, },
"additionalProperties": false, "additionalProperties": false,
"required": [ "required": [
"name", "name",
"label",
] ]
}), }),
"restriction": () => restriction_logged_in, "restriction": () => restriction_logged_in,

1
source/api/actions/invitation_accept.ts
View file

@ -26,6 +26,7 @@ namespace _espe.api
key : string; key : string;
data : { data : {
name : (null | string); name : (null | string);
label : (null | string);
groups : (null | Array<int>); groups : (null | Array<int>);
email_address : (null | string); email_address : (null | string);
password : (null | string); password : (null | string);

4
source/api/actions/invitation_create.ts
View file

@ -27,6 +27,8 @@ namespace _espe.api
data : { data : {
name_changeable : boolean; name_changeable : boolean;
name_value : string; name_value : string;
label_changeable : boolean;
label_value : string;
email_address_changeable : boolean; email_address_changeable : boolean;
email_address_value : (null | string); email_address_value : (null | string);
groups_changeable : boolean; groups_changeable : boolean;
@ -160,6 +162,8 @@ namespace _espe.api
{ {
"name_changeable": input.data.name_changeable, "name_changeable": input.data.name_changeable,
"name_value": input.data.name_value, "name_value": input.data.name_value,
"label_changeable": input.data.label_changeable,
"label_value": input.data.label_value,
"email_address_changeable": input.data.email_address_changeable, "email_address_changeable": input.data.email_address_changeable,
"email_address_value": input.data.email_address_value, "email_address_value": input.data.email_address_value,
"groups_changeable": input.data.groups_changeable, "groups_changeable": input.data.groups_changeable,

14
source/api/actions/invitation_examine.ts
View file

@ -60,6 +60,16 @@ namespace _espe.api
"nullable": true, "nullable": true,
"description": "Name | Wert" "description": "Name | Wert"
}, },
"label_changeable": {
"type": "boolean",
"nullable": false,
"description": "Beschriftung | änderbar"
},
"label_value": {
"type": "string",
"nullable": true,
"description": "Beschriftung | Wert"
},
"email_address_changeable": { "email_address_changeable": {
"type": "boolean", "type": "boolean",
"nullable": false, "nullable": false,
@ -89,6 +99,8 @@ namespace _espe.api
"expiry", "expiry",
"name_changeable", "name_changeable",
"name_value", "name_value",
"label_changeable",
"label_value",
"email_address_changeable", "email_address_changeable",
"email_address_value", "email_address_value",
"groups_changeable", "groups_changeable",
@ -107,6 +119,8 @@ namespace _espe.api
"expiry": invitation_object.expiry, "expiry": invitation_object.expiry,
"name_changeable": invitation_object.name_changeable, "name_changeable": invitation_object.name_changeable,
"name_value": invitation_object.name_value, "name_value": invitation_object.name_value,
"label_changeable": invitation_object.label_changeable,
"label_value": invitation_object.label_value,
"email_address_changeable": invitation_object.email_address_changeable, "email_address_changeable": invitation_object.email_address_changeable,
"email_address_value": invitation_object.email_address_value, "email_address_value": invitation_object.email_address_value,
"groups_changeable": invitation_object.groups_changeable, "groups_changeable": invitation_object.groups_changeable,

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

@ -26,9 +26,12 @@ namespace _espe.api
Array< Array<
{ {
id : _espe.type.invitation_id; id : _espe.type.invitation_id;
preview : {
key : _espe.type.invitation_key; key : _espe.type.invitation_key;
expiry : (null | int); expiry : (null | int);
name_value : (null | string); name_value : (null | string);
label_value : (null | string);
};
} }
> >
>( >(
@ -65,6 +68,11 @@ namespace _espe.api
"type": "string", "type": "string",
"description": "Name" "description": "Name"
}, },
"label_value": {
"nullable": false,
"type": "string",
"description": "Beschriftung"
},
}, },
"required": [ "required": [
"id", "id",

14
source/api/actions/invitation_read.ts
View file

@ -32,6 +32,8 @@ namespace _espe.api
expiry : (null | int); expiry : (null | int);
name_changeable : boolean; name_changeable : boolean;
name_value : (null | string); name_value : (null | string);
label_changeable : boolean;
label_value : (null | string);
email_address_changeable : boolean; email_address_changeable : boolean;
email_address_value : (null | string); email_address_value : (null | string);
groups_changeable : boolean; groups_changeable : boolean;
@ -74,6 +76,16 @@ namespace _espe.api
"nullable": true, "nullable": true,
"description": "Name | Wert" "description": "Name | Wert"
}, },
"label_changeable": {
"type": "boolean",
"nullable": false,
"description": "Beschriftung | änderbar"
},
"label_value": {
"type": "string",
"nullable": true,
"description": "Beschriftung | Wert"
},
"email_address_changeable": { "email_address_changeable": {
"type": "boolean", "type": "boolean",
"nullable": false, "nullable": false,
@ -122,6 +134,8 @@ namespace _espe.api
"expiry": invitation_object.expiry, "expiry": invitation_object.expiry,
"name_changeable": invitation_object.name_changeable, "name_changeable": invitation_object.name_changeable,
"name_value": invitation_object.name_value, "name_value": invitation_object.name_value,
"label_changeable": invitation_object.label_changeable,
"label_value": invitation_object.label_value,
"email_address_changeable": invitation_object.email_address_changeable, "email_address_changeable": invitation_object.email_address_changeable,
"email_address_value": invitation_object.email_address_value, "email_address_value": invitation_object.email_address_value,
"groups_changeable": invitation_object.groups_changeable, "groups_changeable": invitation_object.groups_changeable,

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

@ -29,6 +29,7 @@ namespace _espe.api
id : int; id : int;
preview : { preview : {
name : string; name : string;
label : string;
}; };
} }
> >
@ -64,11 +65,14 @@ namespace _espe.api
"type": "string", "type": "string",
"nullable": false, "nullable": false,
}, },
"label": {
"type": "string",
"nullable": false,
},
}, },
"required": [ "required": [
"membership_number", "name",
"name_real_value", "label",
"name_real_index",
] ]
} }
}, },

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

@ -24,6 +24,7 @@ namespace _espe.api
{ {
lib_plankton.rest_http.register< lib_plankton.rest_http.register<
{ {
label : string;
email_address : (null | string); email_address : (null | string);
groups ?: Array<int>; groups ?: Array<int>;
enabled : boolean; enabled : boolean;
@ -39,6 +40,10 @@ namespace _espe.api
"nullable": false, "nullable": false,
"type": "object", "type": "object",
"properties": { "properties": {
"label": {
"nullable": true,
"type": "string"
},
"email_address": { "email_address": {
"nullable": true, "nullable": true,
"type": "string" "type": "string"
@ -75,6 +80,7 @@ namespace _espe.api
await _espe.service.member.modify( await _espe.service.member.modify(
member_id, member_id,
{ {
"label": input.label,
"email_address": input.email_address, "email_address": input.email_address,
"groups": ( "groups": (
(input.groups === undefined) (input.groups === undefined)

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

@ -26,6 +26,7 @@ namespace _espe.api
null, null,
{ {
name : string; name : string;
label : string;
email_address : (null | string); email_address : (null | string);
groups : Array<int>; groups : Array<int>;
enabled : boolean; enabled : boolean;
@ -45,6 +46,10 @@ namespace _espe.api
"nullable": false, "nullable": false,
"type": "string" "type": "string"
}, },
"label": {
"nullable": false,
"type": "string"
},
"email_address": { "email_address": {
"nullable": true, "nullable": true,
"type": "string" "type": "string"
@ -65,6 +70,7 @@ namespace _espe.api
"additionalProperties": false, "additionalProperties": false,
"required": [ "required": [
"name", "name",
"label",
"email_address", "email_address",
"groups", "groups",
"enabled", "enabled",
@ -79,6 +85,7 @@ namespace _espe.api
"status_code": 200, "status_code": 200,
"data": { "data": {
"name": member_object.name, "name": member_object.name,
"label": member_object.label,
"email_address": member_object.email_address, "email_address": member_object.email_address,
"groups": member_object.groups, "groups": member_object.groups,
"enabled": member_object.enabled, "enabled": member_object.enabled,

8
source/repositories/group.ts
View file

@ -73,6 +73,7 @@ namespace _espe.repository.group
{ {
return { return {
"name": object.name, "name": object.name,
"label": object.label,
}; };
} }
@ -85,6 +86,7 @@ namespace _espe.repository.group
{ {
return { return {
"name": dispersal["name"], "name": dispersal["name"],
"label": dispersal["label"],
}; };
} }
@ -98,7 +100,10 @@ namespace _espe.repository.group
Array< Array<
{ {
id : _espe.type.group_id; id : _espe.type.group_id;
preview : {
name : string; name : string;
label : string;
};
} }
> >
> >
@ -121,7 +126,10 @@ namespace _espe.repository.group
.map( .map(
({"key": key, "preview": preview}) => ({ ({"key": key, "preview": preview}) => ({
"id": key, "id": key,
"preview": {
"name": preview["name"], "name": preview["name"],
"label": preview["label"],
},
}) })
) )
); );

5
source/repositories/invitation.ts
View file

@ -121,6 +121,8 @@ namespace _espe.repository.invitation
"expiry": object.expiry, "expiry": object.expiry,
"name_changeable": _espe.helpers.dbbool_encode(object.name_changeable), "name_changeable": _espe.helpers.dbbool_encode(object.name_changeable),
"name_value": object.name_value, "name_value": object.name_value,
"label_changeable": _espe.helpers.dbbool_encode(object.label_changeable),
"label_value": object.label_value,
"email_address_changeable": _espe.helpers.dbbool_encode(object.email_address_changeable), "email_address_changeable": _espe.helpers.dbbool_encode(object.email_address_changeable),
"email_address_value": object.email_address_value, "email_address_value": object.email_address_value,
"groups_changeable": _espe.helpers.dbbool_encode(object.groups_changeable), "groups_changeable": _espe.helpers.dbbool_encode(object.groups_changeable),
@ -148,6 +150,8 @@ namespace _espe.repository.invitation
"expiry": dispersal.core_row["expiry"], "expiry": dispersal.core_row["expiry"],
"name_changeable": _espe.helpers.dbbool_decode(dispersal.core_row["name_changeable"]), "name_changeable": _espe.helpers.dbbool_decode(dispersal.core_row["name_changeable"]),
"name_value": dispersal.core_row["name_value"], "name_value": dispersal.core_row["name_value"],
"label_changeable": _espe.helpers.dbbool_decode(dispersal.core_row["label_changeable"]),
"label_value": dispersal.core_row["label_value"],
"email_address_changeable": _espe.helpers.dbbool_decode(dispersal.core_row["email_address_changeable"]), "email_address_changeable": _espe.helpers.dbbool_decode(dispersal.core_row["email_address_changeable"]),
"email_address_value": dispersal.core_row["email_address_value"], "email_address_value": dispersal.core_row["email_address_value"],
"groups_changeable": _espe.helpers.dbbool_decode(dispersal.core_row["groups_changeable"]), "groups_changeable": _espe.helpers.dbbool_decode(dispersal.core_row["groups_changeable"]),
@ -193,6 +197,7 @@ namespace _espe.repository.invitation
"id": key, "id": key,
"preview": { "preview": {
"name": preview["name_value"], "name": preview["name_value"],
"label": preview["label_value"],
} }
}) })
) )

4
source/repositories/member.ts
View file

@ -118,6 +118,7 @@ namespace _espe.repository.member
return { return {
"core_row": { "core_row": {
"name": object.name, "name": object.name,
"label": object.label,
"email_address": object.email_address, "email_address": object.email_address,
"enabled": _espe.helpers.dbbool_encode(object.enabled), "enabled": _espe.helpers.dbbool_encode(object.enabled),
"password_image": object.password_image, "password_image": object.password_image,
@ -144,6 +145,7 @@ namespace _espe.repository.member
{ {
return { return {
"name": dispersal.core_row["name"], "name": dispersal.core_row["name"],
"label": dispersal.core_row["label"],
"email_address": dispersal.core_row["email_address"], "email_address": dispersal.core_row["email_address"],
"groups": lib_plankton.list.sorted<_espe.type.group_id>( "groups": lib_plankton.list.sorted<_espe.type.group_id>(
dispersal.group_rows.map(row => row["group_id"]), dispersal.group_rows.map(row => row["group_id"]),
@ -170,6 +172,7 @@ namespace _espe.repository.member
id : _espe.type.member_id; id : _espe.type.member_id;
preview : { preview : {
name : string; name : string;
label : string;
}; };
} }
> >
@ -195,6 +198,7 @@ namespace _espe.repository.member
"id": key, "id": key,
"preview": { "preview": {
"name": preview["name"], "name": preview["name"],
"label": preview["label"],
} }
}) })
) )

8
source/sample.ts
View file

@ -23,6 +23,7 @@ namespace _espe.sample
{ {
id : int; id : int;
name : string; name : string;
label : string;
} }
>; >;
admins : Array< admins : Array<
@ -37,6 +38,7 @@ namespace _espe.sample
{ {
id : int; id : int;
name : string; name : string;
label : string;
email_address : (null | string); email_address : (null | string);
groups : Array<int>; groups : Array<int>;
} }
@ -46,6 +48,8 @@ namespace _espe.sample
id : int; id : int;
name_changeable : boolean; name_changeable : boolean;
name_value : string; name_value : string;
label_changeable : boolean;
label_value : string;
email_address_changeable : boolean; email_address_changeable : boolean;
email_address_value : (null | string); email_address_value : (null | string);
groups_changeable : boolean; groups_changeable : boolean;
@ -69,6 +73,7 @@ namespace _espe.sample
const group_id : _espe.type.group_id = await _espe.service.group.add( const group_id : _espe.type.group_id = await _espe.service.group.add(
{ {
"name": group_raw.name, "name": group_raw.name,
"label": group_raw.label,
} }
); );
track_groups.set(group_raw.id, group_id); track_groups.set(group_raw.id, group_id);
@ -92,6 +97,7 @@ namespace _espe.sample
const member_id : _espe.type.member_id = await _espe.service.member.project( const member_id : _espe.type.member_id = await _espe.service.member.project(
{ {
"name": member_raw.name, "name": member_raw.name,
"label": member_raw.label,
"email_address": member_raw.email_address, "email_address": member_raw.email_address,
"groups": member_raw.groups.map(group_id => track_groups.get(group_id)), "groups": member_raw.groups.map(group_id => track_groups.get(group_id)),
}, },
@ -112,6 +118,8 @@ namespace _espe.sample
{ {
"name_changeable": invitation_raw.name_changeable, "name_changeable": invitation_raw.name_changeable,
"name_value": invitation_raw.name_value, "name_value": invitation_raw.name_value,
"label_changeable": invitation_raw.label_changeable,
"label_value": invitation_raw.label_value,
"email_address_changeable": invitation_raw.email_address_changeable, "email_address_changeable": invitation_raw.email_address_changeable,
"email_address_value": invitation_raw.email_address_value, "email_address_value": invitation_raw.email_address_value,
"groups_changeable": invitation_raw.groups_changeable, "groups_changeable": invitation_raw.groups_changeable,

20
source/services/group.ts
View file

@ -19,7 +19,17 @@ namespace _espe.service.group
/** /**
*/ */
export function list( export function list(
) : Promise<Array<{id : _espe.type.group_id; name : string;}>> ) : Promise<
Array<
{
id : _espe.type.group_id;
preview : {
name : string;
label : string;
};
}
>
>
{ {
return _espe.repository.group.list(null); return _espe.repository.group.list(null);
} }
@ -47,12 +57,14 @@ namespace _espe.service.group
/** /**
*/ */
export function modify( export async function modify(
id : _espe.type.group_id, id : _espe.type.group_id,
object : _espe.type.group_object label : string
) : Promise<void> ) : Promise<void>
{ {
return _espe.repository.group.update(id, object); const object : _espe.type.group_object = await _espe.repository.group.read(id);
object.label = label;
await _espe.repository.group.update(id, object);
} }
} }

24
source/services/invitation.ts
View file

@ -23,9 +23,12 @@ namespace _espe.service.invitation
Array< Array<
{ {
id : _espe.type.invitation_id; id : _espe.type.invitation_id;
preview : {
key : _espe.type.invitation_key; key : _espe.type.invitation_key;
expiry : (null | int); expiry : (null | int);
name_value : (null | string); name_value : (null | string);
label_value : (null | string);
};
} }
> >
> >
@ -37,9 +40,12 @@ namespace _espe.service.invitation
entries.map( entries.map(
entry => ({ entry => ({
"id": entry.id, "id": entry.id,
"preview": {
"key": entry.object.key, "key": entry.object.key,
"expiry": entry.object.expiry, "expiry": entry.object.expiry,
"name_value": entry.object.name_value "name_value": entry.object.name_value,
"label_value": entry.object.label_value,
}
}) })
) )
) )
@ -54,6 +60,8 @@ namespace _espe.service.invitation
{ {
"name_changeable": name_changeable, "name_changeable": name_changeable,
"name_value": name_value, "name_value": name_value,
"label_changeable": label_changeable,
"label_value": label_value,
"email_address_changeable": email_address_changeable, "email_address_changeable": email_address_changeable,
"email_address_value": email_address_value, "email_address_value": email_address_value,
"groups_changeable": groups_changeable, "groups_changeable": groups_changeable,
@ -61,6 +69,8 @@ namespace _espe.service.invitation
} : { } : {
name_changeable : boolean; name_changeable : boolean;
name_value : string; name_value : string;
label_changeable : boolean;
label_value : string;
email_address_changeable : boolean; email_address_changeable : boolean;
email_address_value : (null | string); email_address_value : (null | string);
groups_changeable : boolean; groups_changeable : boolean;
@ -106,6 +116,8 @@ namespace _espe.service.invitation
), ),
"name_changeable": name_changeable, "name_changeable": name_changeable,
"name_value": name_value, "name_value": name_value,
"label_changeable": label_changeable,
"label_value": label_value,
"email_address_changeable": email_address_changeable, "email_address_changeable": email_address_changeable,
"email_address_value": email_address_value, "email_address_value": email_address_value,
"groups_changeable": groups_changeable, "groups_changeable": groups_changeable,
@ -247,6 +259,7 @@ namespace _espe.service.invitation
key : _espe.type.invitation_key, key : _espe.type.invitation_key,
data : { data : {
name : (null | string); name : (null | string);
label : (null | string);
groups : (null | Array<_espe.type.group_id>); groups : (null | Array<_espe.type.group_id>);
email_address : (null | string); email_address : (null | string);
password : (null | string); password : (null | string);
@ -320,6 +333,15 @@ namespace _espe.service.invitation
invitation_object.name_value invitation_object.name_value
) as string ) as string
), ),
"label": (
(
invitation_object.label_changeable
?
data.label
:
invitation_object.label_value
) as string
),
"email_address": ( "email_address": (
( (
invitation_object.email_address_changeable invitation_object.email_address_changeable

57
source/services/member.ts
View file

@ -103,7 +103,11 @@ namespace _espe.service.member
object : _espe.type.member_object object : _espe.type.member_object
) : string ) : string
{ {
return object.name; return (
object.label
??
object.name
);
} }
@ -229,6 +233,7 @@ namespace _espe.service.member
id : _espe.type.member_id; id : _espe.type.member_id;
preview : { preview : {
name : string; name : string;
label : string;
}; };
} }
> >
@ -256,6 +261,7 @@ namespace _espe.service.member
export async function project( export async function project(
data : { data : {
name : string; name : string;
label : string;
email_address : (null | string); email_address : (null | string);
groups : Array<_espe.type.group_id>; groups : Array<_espe.type.group_id>;
}, },
@ -269,6 +275,7 @@ namespace _espe.service.member
{ {
const object : _espe.type.member_object = { const object : _espe.type.member_object = {
"name": data.name, "name": data.name,
"label": data.label,
"email_address": data.email_address, "email_address": data.email_address,
"groups": data.groups, "groups": data.groups,
"enabled": true, "enabled": true,
@ -295,6 +302,7 @@ namespace _espe.service.member
export async function add( export async function add(
data : { data : {
name : string; name : string;
label : string;
email_address : (null | string); email_address : (null | string);
groups : Array<_espe.type.group_id>; groups : Array<_espe.type.group_id>;
password : string; password : string;
@ -309,6 +317,7 @@ namespace _espe.service.member
{ {
const object : _espe.type.member_object = { const object : _espe.type.member_object = {
"name": data.name, "name": data.name,
"label": data.label,
"email_address": data.email_address, "email_address": data.email_address,
"groups": data.groups, "groups": data.groups,
"enabled": true, "enabled": true,
@ -391,6 +400,7 @@ namespace _espe.service.member
export async function modify( export async function modify(
member_id : _espe.type.member_id, member_id : _espe.type.member_id,
data : { data : {
label : string;
email_address : (null | string); email_address : (null | string);
enabled : boolean; enabled : boolean;
groups : lib_plankton.pod.type_pod<Array<_espe.type.group_id>>; groups : lib_plankton.pod.type_pod<Array<_espe.type.group_id>>;
@ -400,6 +410,7 @@ namespace _espe.service.member
const member_object_old : _espe.type.member_object = await get(member_id); const member_object_old : _espe.type.member_object = await get(member_id);
const member_object_new : _espe.type.member_object = { const member_object_new : _espe.type.member_object = {
"name": member_object_old.name, "name": member_object_old.name,
"label": data.label,
"email_address": data.email_address, "email_address": data.email_address,
"groups": ( "groups": (
lib_plankton.pod.is_filled<Array<_espe.type.group_id>>(data.groups) lib_plankton.pod.is_filled<Array<_espe.type.group_id>>(data.groups)
@ -494,6 +505,7 @@ namespace _espe.service.member
const token : string = await _espe.helpers.verification_get(Math.floor(Math.random() * (1 << 24))); const token : string = await _espe.helpers.verification_get(Math.floor(Math.random() * (1 << 24)));
const member_object_new : _espe.type.member_object = { const member_object_new : _espe.type.member_object = {
"name": member_object_old.name, "name": member_object_old.name,
"label": member_object_old.label,
"email_address": member_object_old.email_address, "email_address": member_object_old.email_address,
"enabled": member_object_old.enabled, "enabled": member_object_old.enabled,
"groups": member_object_old.groups, "groups": member_object_old.groups,
@ -585,6 +597,7 @@ namespace _espe.service.member
else { else {
const member_object_new : _espe.type.member_object = { const member_object_new : _espe.type.member_object = {
"name": member_object_old.name, "name": member_object_old.name,
"label": member_object_old.label,
"email_address": member_object_old.email_address, "email_address": member_object_old.email_address,
"groups": member_object_old.groups, "groups": member_object_old.groups,
"enabled": member_object_old.enabled, "enabled": member_object_old.enabled,
@ -638,6 +651,34 @@ namespace _espe.service.member
groups : Array<string>; groups : Array<string>;
password : string; password : string;
}; };
const groups_as_array : Array<
{
id : _espe.type.group_id;
preview : {
name : string;
label : string;
};
}
> = await _espe.service.group.list();
const groups_as_map : Map<
_espe.type.group_id,
_espe.type.group_object
> = new Map<
_espe.type.group_id,
_espe.type.group_object
>();
for (const group_entry of groups_as_array)
{
groups_as_map.set(
group_entry.id,
{
"name": group_entry.preview.name,
"label": group_entry.preview.label,
}
);
}
return lib_plankton.call.convey( return lib_plankton.call.convey(
( (
( (
@ -673,10 +714,16 @@ namespace _espe.service.member
"disabled": (! entry.object.enabled), "disabled": (! entry.object.enabled),
"displayname": name_display(entry.object), "displayname": name_display(entry.object),
"email": entry.email_address, "email": entry.email_address,
/** "groups": (
* @todo covert to string entry.object.groups
*/ .map(
"groups": entry.object.groups, (group_id : _espe.type.group_id) => (
groups_as_map.get(group_id)?.name
??
group_id.toFixed(0)
)
)
),
"password": entry.object.password_image, "password": entry.object.password_image,
} }
]) ])

4
source/types.ts
View file

@ -25,6 +25,7 @@ namespace _espe.type
*/ */
export type group_object = { export type group_object = {
name : string; name : string;
label : string;
}; };
@ -52,6 +53,7 @@ namespace _espe.type
*/ */
export type member_object = { export type member_object = {
name : string; name : string;
label : string;
email_address : (null | string); email_address : (null | string);
groups : Array<group_id>; groups : Array<group_id>;
enabled : boolean; enabled : boolean;
@ -79,6 +81,8 @@ namespace _espe.type
expiry : (null | int); expiry : (null | int);
name_changeable : boolean; name_changeable : boolean;
name_value : (null | string); name_value : (null | string);
label_changeable : boolean;
label_value : (null | string);
email_address_changeable : boolean; email_address_changeable : boolean;
email_address_value : (null | string); email_address_value : (null | string);
groups_changeable : boolean; groups_changeable : boolean;