source/backend.py

@@ -29,7 +29,6 @@ def backend_api_call_generic(
 			"with_session_key": (not (session_key is None)),
 			"http_method": http_method,
 			"path": action_path,
-			"data": data,
 		}
 	)
 	target = string_coin(
@@ -128,19 +127,9 @@ def backend_api_call_wrapped(
 	)
 	
 
-def backend_api_call_group_list(
-):
-	return backend_api_call_wrapped(
-		False,
-		"GET",
-		"/group/list",
-		None
-	)
-	
-
 def backend_api_call_session_end(
 ):
-	return backend_api_call_wrapped(
+	return backend_api_call_generic(
 		True,
 		"DELETE",
 		"/session/end",
@@ -169,6 +158,27 @@ def backend_api_call_member_read(
 	)
 	
 
+def backend_api_call_member_project(
+	membership_number : _typing.Optional[str],
+	name_real_value : str,
+	email_address_private : _typing.Optional[str],
+	groups : list[str],
+	notification_target_url_template : _typing.Optional[str]
+):
+	return backend_api_call_wrapped(
+		True,
+		"POST",
+		"/member/project",
+		{
+			"membership_number": membership_number,
+			"name_real_value": name_real_value,
+			"email_address_private": email_address_private,
+			"groups": groups,
+			"notification_target_url_template": notification_target_url_template,
+		}
+	)
+	
+
 def backend_api_call_member_delete(
 	member_id : int
 ):
@@ -179,45 +189,3 @@ def backend_api_call_member_delete(
 		None
 	)
 	
-
-def backend_api_call_invitation_create(
-	name_changeable,
-	name_value,
-	label_changeable,
-	label_value,
-	email_address_changeable,
-	email_address_value,
-	groups_changeable,
-	groups_value,
-	expiry,
-	options = None
-):
-	options = (
-		{
-			"send_immediatly": True,
-		}
-		|
-		(options or {})
-	)
-	result = backend_api_call_wrapped(
-		True,
-		"POST",
-		"/invitation/create",
-		{
-			"data": {
-				"name_changeable": name_changeable,
-				"name_value": name_value,
-				"label_changeable": label_changeable,
-				"label_value": label_value,
-				"email_address_changeable": email_address_changeable,
-				"email_address_value": email_address_value,
-				"groups_changeable": groups_changeable,
-				"groups_value": groups_value,
-				"expiry": expiry,
-			},
-			"send_immediatly": options["send_immediatly"],
-		}
-	)
-	return result
-	
-	

source/main.py

@@ -26,12 +26,11 @@ def main():
 			"conf-expose",
 			"member-list",
 			"member-read",
+			"member-project",
 			"member-delete",
-			"invite-single",
-			"invite-mass",
 		],
 		metavar = "<action>",
-		help = "auszuführende Aktion; Optionen: 'conf-schema' : JSON-Schema der Konfiguration ausgeben | 'conf-expose' : vervollständigte Konfiguration ausgegeben | 'member-list' : Liste der Mitglieder ausgeben | 'member-read' : Daten eines Mitglieds ausgeben | 'member-delete' : einer Mitglieder-Datensatz löschen | 'invite-single' : einzelne Einladung erstellen | 'invite-mass' : Massen-Einladungen erstellen",
+		help = "auszuführende Aktion; Optionen: 'conf-schema' : JSON-Schema der Konfiguration ausgeben | 'conf-expose' : vervollständigte Konfiguration ausgegeben | 'member-list' : Liste der Mitglieder ausgeben | 'member-read' : Daten eines Mitglieds ausgeben | 'member-project' : ein Mitglied anlegen und die ID des erzeugten Datensatzes ausgeben | 'member-delete' : einer Mitglieder-Datensatz löschen",
 	)
 	argument_parser.add_argument(
 		"-c",
@@ -42,15 +41,6 @@ def main():
 		metavar = "<conf-path>",
 		help = "Pfad zur Konfigurations-Datei",
 	)
-	argument_parser.add_argument(
-		"-d",
-		"--data-path",
-		type = str,
-		dest = "data_path",
-		default = None,
-		metavar = "<data-path>",
-		help = "Pfad zu Daten für Massen-Einladung",
-	)
 	argument_parser.add_argument(
 		"-i",
 		"--id",
@@ -60,6 +50,15 @@ def main():
 		metavar = "<id>",
 		help = "ID des Mitglieds",
 	)
+	argument_parser.add_argument(
+		"-m",
+		"--membership-number",
+		type = str,
+		dest = "membership_number",
+		default = None,
+		metavar = "<membership-number>",
+		help = "Mitglieds-Nummer des Mitglieds",
+	)
 	argument_parser.add_argument(
 		"-n",
 		"--name",
@@ -67,30 +66,7 @@ def main():
 		dest = "name",
 		default = None,
 		metavar = "<name>",
-		help = "Anmelde-Name des Mitglieds; Leerzeichen sind durch '_' zu ersetzen",
+		help = "Name des Mitglieds; Leerzeichen sind durch '_' zu ersetzen",
-	)
-	argument_parser.add_argument(
-		"-N",
-		"--fixed-name",
-		dest = "fixed_name",
-		action = 'store_true',
-		help = "ob der Anmelde-Name einer Einladung geändert werden kann",
-	)
-	argument_parser.add_argument(
-		"-l",
-		"--label",
-		type = str,
-		dest = "label",
-		default = None,
-		metavar = "<label>",
-		help = "Anzeige-Name des Mitglieds",
-	)
-	argument_parser.add_argument(
-		"-L",
-		"--fixed-label",
-		dest = "fixed_label",
-		action = 'store_true',
-		help = "ob der Anzeige-Name einer Einladung geändert werden kann",
 	)
 	argument_parser.add_argument(
 		"-e",
@@ -101,13 +77,6 @@ def main():
 		metavar = "<email-address>",
 		help = "E-Mail-Adresse des Mitglieds",
 	)
-	argument_parser.add_argument(
-		"-E",
-		"--fixed-email-address",
-		dest = "fixed_email_address",
-		action = 'store_true',
-		help = "ob der E-Mail-Adresse einer Einladung geändert werden kann",
-	)
 	argument_parser.add_argument(
 		"-g",
 		"--groups",
@@ -117,29 +86,6 @@ def main():
 		metavar = "<groups>",
 		help = "Gruppen, zu welchen das Mitglied hinzugefügt werden soll, als Komma-getrennte Liste",
 	)
-	argument_parser.add_argument(
-		"-G",
-		"--fixed-groups",
-		dest = "fixed_groups",
-		action = 'store_true',
-		help = "ob die Gruppen einer Einladung geändert werden kann",
-	)
-	argument_parser.add_argument(
-		"-x",
-		"--expiry",
-		type = int,
-		dest = "expiry",
-		default = None,
-		metavar = "<expiry>",
-		help = "UNIX-Timestamp des Ablaufdatums der Einladung",
-	)
-	argument_parser.add_argument(
-		"-s",
-		"--send",
-		dest = "send",
-		action = 'store_true',
-		help = "ob eine Einladung nach Einarbeitung ins Backend an die angegebene E-Mail-Adresse gesendet werden soll",
-	)
 	args = argument_parser.parse_args()
 	
 	## conf
@@ -158,44 +104,7 @@ def main():
 			),
 		}
 	)
-	
 	## exec
-	groups = convey(
-		backend_api_call_group_list(),
-		[
-			lambda x: map(
-				lambda entry: (entry["preview"]["name"], entry["id"], ),
-				x
-			),
-			dict,
-		]
-	)
-	data = {
-		"id": args.id,
-		"name_changeable": (not args.fixed_name),
-		"name_value": args.name,
-		"label_changeable": (not args.fixed_label),
-		"label_value": (
-			None
-			if (args.label is None) else
-			args.label.replace("_", " ")
-		),
-		"email_address_changeable": (not args.fixed_email_address),
-		"email_address_value": args.email_address,
-		"groups_changeable": (not args.fixed_groups),
-		"groups_value": (
-			[]
-			if (args.groups is None) else
-			convey(
-				args.groups.split(","),
-				[
-					lambda x: map(lambda group_name: groups[group_name], x),
-					list,
-				]
-			)
-		),
-		"expiry": args.expiry,
-	}
 	if (args.action == "conf-schema"):
 		_sys.stdout.write(_json.dumps(conf_schema(), indent = "\t") + "\n")
 	elif (args.action == "conf-expose"):
@@ -206,7 +115,7 @@ def main():
 		_sys.stdout.write(_json.dumps(data, indent = "\t") + "\n")
 	elif (args.action == "member-read"):
 		if (
-			(data["id"] is None)
+			(args.id is None)
 		):
 			log_error(
 				"mandatory_parameters_missing",
@@ -218,12 +127,39 @@ def main():
 			)
 		else:
 			data = backend_api_call_member_read(
-				data["id"]
+				args.id
 			)
 			_sys.stdout.write(_json.dumps(data, indent = "\t") + "\n")
+	elif (args.action == "member-project"):
+		if (
+			(args.membership_number is None)
+			or
+			(args.name is None)
+			or
+			(args.email_address is None)
+		):
+			log_error(
+				"mandatory_parameters_missing",
+				{
+					"parameters": [
+						"membership_number",
+						"name",
+						"email_address",
+					]
+				}
+			)
+		else:
+			member_id = backend_api_call_member_project(
+				args.membership_number,
+				args.name.replace("_", " "),
+				args.email_address,
+				([] if (args.groups is None) else args.groups.split(",")),
+				None
+			)
+			_sys.stdout.write(_json.dumps(member_id, indent = "\t") + "\n")
 	elif (args.action == "member-delete"):
 		if (
-			(data["id"] is None)
+			(args.id is None)
 		):
 			log_error(
 				"mandatory_parameters_missing",
@@ -235,67 +171,8 @@ def main():
 			)
 		else:
 			member_id = backend_api_call_member_delete(
-				data["id"]
+				args.id
 			)
-	elif (args.action == "invite-single"):
-		if (
-			(data["name_value"] is None)
-			or
-			(data["label_value"] is None)
-		):
-			log_error(
-				"mandatory_parameters_missing",
-				{
-					"parameters": [
-						"name",
-						"label",
-					]
-				}
-			)
-		else:
-			result = backend_api_call_invitation_create(
-				data["name_changeable"],
-				data["name_value"],
-				data["label_changeable"],
-				data["label_value"],
-				data["email_address_changeable"],
-				data["email_address_value"],
-				data["groups_changeable"],
-				data["groups_value"],
-				data["expiry"],
-				{
-					"send_immediatly": args.send,
-				}
-			)
-			key = result["key"]
-			url = result["url"]
-			_sys.stdout.write(url + "\n")
-	elif (args.action == "invite-mass"):
-		invitation_data = _json.loads(file_text_read(args.data_path))
-		for entry in invitation_data:
-			result = backend_api_call_invitation_create(
-				entry.get("name_changeable", True),
-				entry["name_value"],
-				entry.get("label_changeable", True),
-				entry["label_value"],
-				entry.get("email_address_changeable", True),
-				entry["email_address_value"],
-				entry.get("groups_changeable", True),
-				convey(
-					entry.get("groups_value", []),
-					[
-						lambda x: map(lambda group_name: groups[group_name], x),
-						list,
-					]
-				),
-				# todo: assign default?
-				entry.get("expiry", None),
-				{
-					"send_immediatly": args.send,
-				}
-			)
-			# _sys.stdout.write(result["url"] + "\n")
-			# todo: delay
 	else:
 		raise NotImplementedError()
 	
@@ -305,4 +182,3 @@ try:
 except ValueError as error:
 	_sys.stderr.write(str(error) + "\n")
 	_sys.exit(1)
-