From ee5b297016aa9193c60d885123384dd042f5f103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?=
 <christian.frass@dielinke-glauchau.de>
Date: Mon, 31 Mar 2025 17:27:00 +0000
Subject: [PATCH 1/5] [task-193] [int]

---
 source/structure/r6-1.sindri.json | 258 ++++++++++++++++++++++++++++++
 source/structure/r6-2.sindri.json | 198 +++++++++++++++++++++++
 2 files changed, 456 insertions(+)
 create mode 100644 source/structure/r6-1.sindri.json
 create mode 100644 source/structure/r6-2.sindri.json

diff --git a/source/structure/r6-1.sindri.json b/source/structure/r6-1.sindri.json
new file mode 100644
index 0000000..f104912
--- /dev/null
+++ b/source/structure/r6-1.sindri.json
@@ -0,0 +1,258 @@
+{
+	"domains": [
+		{
+			"name": "sessions",
+			"data_fields": [
+				{
+					"name": "key",
+					"type": "string_medium",
+					"nullable": false
+				},
+				{
+					"name": "data",
+					"type": "string_long",
+					"nullable": false
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["key"]
+					}
+				}
+			]
+		},
+		{
+			"name": "name_indices",
+			"data_fields": [
+				{
+					"name": "name_image",
+					"type": "string_medium",
+					"nullable": false
+				},
+				{
+					"name": "index",
+					"type": "integer",
+					"nullable": false
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["name_image"]
+					}
+				}
+			]
+		},
+		{
+			"name": "members",
+			"key_field": {
+				"name": "id"
+			},
+			"data_fields": [
+				{
+					"name": "membership_number",
+					"type": "string_short",
+					"nullable": true
+				},
+				{
+					"name": "name_real_value",
+					"type": "string_short",
+					"nullable": false
+				},
+				{
+					"name": "name_real_index",
+					"type": "integer",
+					"nullable": false
+				},
+				{
+					"name": "email_address_private",
+					"type": "string_short",
+					"nullable": true
+				},
+				{
+					"name": "registered",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "enabled",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_use_veiled_address",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_use_nominal_address",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_redirect_to_private_address",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_allow_sending",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "password_image",
+					"type": "string_medium",
+					"nullable": true
+				},
+				{
+					"name": "password_change_last_attempt",
+					"type": "integer",
+					"nullable": true
+				},
+				{
+					"name": "password_change_token",
+					"type": "string_medium",
+					"nullable": true
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["name_real_value","name_real_index"]
+					}
+				}
+			]
+		},
+		{
+			"name": "member_groups",
+			"data_fields": [
+				{
+					"name": "member_id",
+					"type": "integer",
+					"nullable": false
+				},
+				{
+					"name": "group_name",
+					"type": "string_medium",
+					"nullable": false
+				},
+				{
+					"name": "_dummy",
+					"type": "boolean",
+					"nullable": true
+				}
+			],
+			"constraints": [
+				{
+					"kind": "foreign_key",
+					"parameters": {
+						"fields": ["member_id"],
+						"reference": {
+							"name": "members",
+							"fields": ["id"]
+						}
+					}
+				},
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["member_id","group_name"]
+					}
+				}
+			]
+		},
+		{
+			"name": "invites",
+			"key_field": {
+				"name": "id"
+			},
+			"data_fields": [
+				{
+					"name": "key",
+					"type": "string_short",
+					"nullable": false
+				},
+				{
+					"name": "membership_number_mode",
+					"type": "integer",
+					"nullable": false
+				},
+				{
+					"name": "membership_number_value",
+					"type": "string_short",
+					"nullable": true
+				},
+				{
+					"name": "name_mode",
+					"type": "integer",
+					"nullable": false
+				},
+				{
+					"name": "name_value",
+					"type": "string_short",
+					"nullable": true
+				},
+				{
+					"name": "email_address_mode",
+					"type": "integer",
+					"nullable": false
+				},
+				{
+					"name": "email_address_value",
+					"type": "string_short",
+					"nullable": true
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["key"]
+					}
+				}
+			]
+		},
+		{
+			"name": "invite_groups",
+			"data_fields": [
+				{
+					"name": "invite_id",
+					"type": "integer",
+					"nullable": false
+				},
+				{
+					"name": "group_name",
+					"type": "string_medium",
+					"nullable": false
+				},
+				{
+					"name": "_dummy",
+					"type": "boolean",
+					"nullable": true
+				}
+			],
+			"constraints": [
+				{
+					"kind": "foreign_key",
+					"parameters": {
+						"fields": ["invite_id"],
+						"reference": {
+							"name": "invites",
+							"fields": ["id"]
+						}
+					}
+				},
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["invite_id","group_name"]
+					}
+				}
+			]
+		}
+	]
+}
diff --git a/source/structure/r6-2.sindri.json b/source/structure/r6-2.sindri.json
new file mode 100644
index 0000000..9454b26
--- /dev/null
+++ b/source/structure/r6-2.sindri.json
@@ -0,0 +1,198 @@
+{
+	"domains": [
+		{
+			"name": "sessions",
+			"data_fields": [
+				{
+					"name": "key",
+					"type": "string_medium",
+					"nullable": false
+				},
+				{
+					"name": "data",
+					"type": "string_long",
+					"nullable": false
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["key"]
+					}
+				}
+			]
+		},
+		{
+			"name": "name_indices",
+			"data_fields": [
+				{
+					"name": "name_image",
+					"type": "string_medium",
+					"nullable": false
+				},
+				{
+					"name": "index",
+					"type": "integer",
+					"nullable": false
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["name_image"]
+					}
+				}
+			]
+		},
+		{
+			"name": "members",
+			"key_field": {
+				"name": "id"
+			},
+			"data_fields": [
+				{
+					"name": "membership_number",
+					"type": "string_short",
+					"nullable": true
+				},
+				{
+					"name": "name_real_value",
+					"type": "string_short",
+					"nullable": false
+				},
+				{
+					"name": "name_real_index",
+					"type": "integer",
+					"nullable": false
+				},
+				{
+					"name": "email_address_private",
+					"type": "string_short",
+					"nullable": true
+				},
+				{
+					"name": "registered",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "enabled",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_use_veiled_address",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_use_nominal_address",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_redirect_to_private_address",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "email_allow_sending",
+					"type": "boolean",
+					"nullable": false
+				},
+				{
+					"name": "password_image",
+					"type": "string_medium",
+					"nullable": true
+				},
+				{
+					"name": "password_change_last_attempt",
+					"type": "integer",
+					"nullable": true
+				},
+				{
+					"name": "password_change_token",
+					"type": "string_medium",
+					"nullable": true
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["name_real_value","name_real_index"]
+					}
+				}
+			]
+		},
+		{
+			"name": "member_groups",
+			"data_fields": [
+				{
+					"name": "member_id",
+					"type": "integer",
+					"nullable": false
+				},
+				{
+					"name": "group_name",
+					"type": "string_medium",
+					"nullable": false
+				},
+				{
+					"name": "_dummy",
+					"type": "boolean",
+					"nullable": true
+				}
+			],
+			"constraints": [
+				{
+					"kind": "foreign_key",
+					"parameters": {
+						"fields": ["member_id"],
+						"reference": {
+							"name": "members",
+							"fields": ["id"]
+						}
+					}
+				},
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["member_id","group_name"]
+					}
+				}
+			]
+		},
+		{
+			"name": "invites",
+			"data_fields": [
+				{
+					"name": "key",
+					"type": "string_short",
+					"nullable": false
+				},
+				{
+					"name": "member_id",
+					"type": "integer",
+					"nullable": false
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["key"]
+					}
+				},
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["member_id"]
+					}
+				}
+			]
+		}
+	]
+}
-- 
2.39.5


From fa75ad2b146dfcc53247dc04a053cd91207fe063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?=
 <christian.frass@dielinke-glauchau.de>
Date: Mon, 31 Mar 2025 19:41:13 +0000
Subject: [PATCH 2/5] [task-193] [mod] r7

---
 .../{r6-1.sindri.json => r7.sindri.json}      | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)
 rename source/structure/{r6-1.sindri.json => r7.sindri.json} (88%)

diff --git a/source/structure/r6-1.sindri.json b/source/structure/r7.sindri.json
similarity index 88%
rename from source/structure/r6-1.sindri.json
rename to source/structure/r7.sindri.json
index f104912..4f1923b 100644
--- a/source/structure/r6-1.sindri.json
+++ b/source/structure/r7.sindri.json
@@ -23,6 +23,42 @@
 				}
 			]
 		},
+		{
+			"name": "admins",
+			"key_field": {
+				"name": "id"
+			},
+			"data_fields": [
+				{
+					"name": "name",
+					"type": "string_short",
+					"nullable": false
+				},
+				{
+					"name": "email_address",
+					"type": "string_medium",
+					"nullable": true
+				},
+				{
+					"name": "password_image",
+					"type": "string_medium",
+					"nullable": false
+				},
+				{
+					"name": "password_fail_count",
+					"type": "integer",
+					"nullable": false
+				}
+			],
+			"constraints": [
+				{
+					"kind": "unique",
+					"parameters": {
+						"fields": ["name"]
+					}
+				}
+			]
+		},
 		{
 			"name": "name_indices",
 			"data_fields": [
@@ -194,7 +230,7 @@
 				{
 					"name": "name_value",
 					"type": "string_short",
-					"nullable": true
+					"nullable": false
 				},
 				{
 					"name": "email_address_mode",
-- 
2.39.5


From 7bb4f1188fa65d372eb1362c026683f57cb5acb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?=
 <christian.frass@dielinke-glauchau.de>
Date: Mon, 31 Mar 2025 19:42:07 +0000
Subject: [PATCH 3/5] [task-193] [del] r6-2

---
 source/structure/r6-2.sindri.json | 198 ------------------------------
 1 file changed, 198 deletions(-)
 delete mode 100644 source/structure/r6-2.sindri.json

diff --git a/source/structure/r6-2.sindri.json b/source/structure/r6-2.sindri.json
deleted file mode 100644
index 9454b26..0000000
--- a/source/structure/r6-2.sindri.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-	"domains": [
-		{
-			"name": "sessions",
-			"data_fields": [
-				{
-					"name": "key",
-					"type": "string_medium",
-					"nullable": false
-				},
-				{
-					"name": "data",
-					"type": "string_long",
-					"nullable": false
-				}
-			],
-			"constraints": [
-				{
-					"kind": "unique",
-					"parameters": {
-						"fields": ["key"]
-					}
-				}
-			]
-		},
-		{
-			"name": "name_indices",
-			"data_fields": [
-				{
-					"name": "name_image",
-					"type": "string_medium",
-					"nullable": false
-				},
-				{
-					"name": "index",
-					"type": "integer",
-					"nullable": false
-				}
-			],
-			"constraints": [
-				{
-					"kind": "unique",
-					"parameters": {
-						"fields": ["name_image"]
-					}
-				}
-			]
-		},
-		{
-			"name": "members",
-			"key_field": {
-				"name": "id"
-			},
-			"data_fields": [
-				{
-					"name": "membership_number",
-					"type": "string_short",
-					"nullable": true
-				},
-				{
-					"name": "name_real_value",
-					"type": "string_short",
-					"nullable": false
-				},
-				{
-					"name": "name_real_index",
-					"type": "integer",
-					"nullable": false
-				},
-				{
-					"name": "email_address_private",
-					"type": "string_short",
-					"nullable": true
-				},
-				{
-					"name": "registered",
-					"type": "boolean",
-					"nullable": false
-				},
-				{
-					"name": "enabled",
-					"type": "boolean",
-					"nullable": false
-				},
-				{
-					"name": "email_use_veiled_address",
-					"type": "boolean",
-					"nullable": false
-				},
-				{
-					"name": "email_use_nominal_address",
-					"type": "boolean",
-					"nullable": false
-				},
-				{
-					"name": "email_redirect_to_private_address",
-					"type": "boolean",
-					"nullable": false
-				},
-				{
-					"name": "email_allow_sending",
-					"type": "boolean",
-					"nullable": false
-				},
-				{
-					"name": "password_image",
-					"type": "string_medium",
-					"nullable": true
-				},
-				{
-					"name": "password_change_last_attempt",
-					"type": "integer",
-					"nullable": true
-				},
-				{
-					"name": "password_change_token",
-					"type": "string_medium",
-					"nullable": true
-				}
-			],
-			"constraints": [
-				{
-					"kind": "unique",
-					"parameters": {
-						"fields": ["name_real_value","name_real_index"]
-					}
-				}
-			]
-		},
-		{
-			"name": "member_groups",
-			"data_fields": [
-				{
-					"name": "member_id",
-					"type": "integer",
-					"nullable": false
-				},
-				{
-					"name": "group_name",
-					"type": "string_medium",
-					"nullable": false
-				},
-				{
-					"name": "_dummy",
-					"type": "boolean",
-					"nullable": true
-				}
-			],
-			"constraints": [
-				{
-					"kind": "foreign_key",
-					"parameters": {
-						"fields": ["member_id"],
-						"reference": {
-							"name": "members",
-							"fields": ["id"]
-						}
-					}
-				},
-				{
-					"kind": "unique",
-					"parameters": {
-						"fields": ["member_id","group_name"]
-					}
-				}
-			]
-		},
-		{
-			"name": "invites",
-			"data_fields": [
-				{
-					"name": "key",
-					"type": "string_short",
-					"nullable": false
-				},
-				{
-					"name": "member_id",
-					"type": "integer",
-					"nullable": false
-				}
-			],
-			"constraints": [
-				{
-					"kind": "unique",
-					"parameters": {
-						"fields": ["key"]
-					}
-				},
-				{
-					"kind": "unique",
-					"parameters": {
-						"fields": ["member_id"]
-					}
-				}
-			]
-		}
-	]
-}
-- 
2.39.5


From 1aa1fb78ac9cec9c74d4ef7b3b760e7e3ae3856c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?=
 <christian.frass@dielinke-glauchau.de>
Date: Tue, 1 Apr 2025 04:21:11 +0000
Subject: [PATCH 4/5] [task-193] [mod] r7

---
 source/structure/r7.sindri.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/source/structure/r7.sindri.json b/source/structure/r7.sindri.json
index 4f1923b..19292b0 100644
--- a/source/structure/r7.sindri.json
+++ b/source/structure/r7.sindri.json
@@ -212,6 +212,11 @@
 					"type": "string_short",
 					"nullable": false
 				},
+				{
+					"name": "expiry",
+					"type": "integer",
+					"nullable": true
+				},
 				{
 					"name": "membership_number_mode",
 					"type": "integer",
@@ -241,6 +246,11 @@
 					"name": "email_address_value",
 					"type": "string_short",
 					"nullable": true
+				},
+				{
+					"name": "groups_mode",
+					"type": "integer",
+					"nullable": false
 				}
 			],
 			"constraints": [
-- 
2.39.5


From 9a892ddee0c5e244011cd54bd6082b09d0da10ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?=
 <christian.frass@dielinke-glauchau.de>
Date: Sat, 12 Apr 2025 10:21:25 +0000
Subject: [PATCH 5/5] [task-193] [int]

---
 source/structure/r7.sindri.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/structure/r7.sindri.json b/source/structure/r7.sindri.json
index 19292b0..85980aa 100644
--- a/source/structure/r7.sindri.json
+++ b/source/structure/r7.sindri.json
@@ -218,8 +218,8 @@
 					"nullable": true
 				},
 				{
-					"name": "membership_number_mode",
-					"type": "integer",
+					"name": "membership_number_changeable",
+					"type": "boolean",
 					"nullable": false
 				},
 				{
@@ -228,8 +228,8 @@
 					"nullable": true
 				},
 				{
-					"name": "name_mode",
-					"type": "integer",
+					"name": "name_changeable",
+					"type": "boolean",
 					"nullable": false
 				},
 				{
@@ -238,8 +238,8 @@
 					"nullable": false
 				},
 				{
-					"name": "email_address_mode",
-					"type": "integer",
+					"name": "email_address_changeable",
+					"type": "boolean",
 					"nullable": false
 				},
 				{
@@ -248,8 +248,8 @@
 					"nullable": true
 				},
 				{
-					"name": "groups_mode",
-					"type": "integer",
+					"name": "groups_changeable",
+					"type": "boolean",
 					"nullable": false
 				}
 			],
-- 
2.39.5