server: add support for creating a group with attributes

server/src/infra/access_control.rs

@@ -6,7 +6,7 @@ use tracing::info;
 use crate::domain::{
     error::Result,
     handler::{
-        AttributeSchema, BackendHandler, CreateUserRequest,
+        AttributeSchema, BackendHandler, CreateGroupRequest, CreateUserRequest,
         GroupBackendHandler, GroupListerBackendHandler, GroupRequestFilter,
         ReadSchemaBackendHandler, Schema, UpdateGroupRequest, UpdateUserRequest,
         UserBackendHandler, UserListerBackendHandler, UserRequestFilter,
@@ -101,7 +101,7 @@ pub trait AdminBackendHandler:
     async fn add_user_to_group(&self, user_id: &UserId, group_id: GroupId) -> Result<()>;
     async fn remove_user_from_group(&self, user_id: &UserId, group_id: GroupId) -> Result<()>;
     async fn update_group(&self, request: UpdateGroupRequest) -> Result<()>;
-    async fn create_group(&self, group_name: &str) -> Result<GroupId>;
+    async fn create_group(&self, request: CreateGroupRequest) -> Result<GroupId>;
     async fn delete_group(&self, group_id: GroupId) -> Result<()>;
 }
 
@@ -155,8 +155,8 @@ impl<Handler: BackendHandler> AdminBackendHandler for Handler {
     async fn update_group(&self, request: UpdateGroupRequest) -> Result<()> {
         <Handler as GroupBackendHandler>::update_group(self, request).await
     }
-    async fn create_group(&self, group_name: &str) -> Result<GroupId> {
-        <Handler as GroupBackendHandler>::create_group(self, group_name).await
+    async fn create_group(&self, request: CreateGroupRequest) -> Result<GroupId> {
+        <Handler as GroupBackendHandler>::create_group(self, request).await
     }
     async fn delete_group(&self, group_id: GroupId) -> Result<()> {
         <Handler as GroupBackendHandler>::delete_group(self, group_id).await

server/src/infra/graphql/mutation.rs

@@ -1,6 +1,9 @@
 use crate::{
     domain::{
-        handler::{BackendHandler, CreateUserRequest, UpdateGroupRequest, UpdateUserRequest},
+        handler::{
+            BackendHandler, CreateGroupRequest, CreateUserRequest, UpdateGroupRequest,
+            UpdateUserRequest,
+        },
         types::{GroupId, JpegPhoto, UserId},
     },
     infra::{
@@ -8,7 +11,7 @@ use crate::{
             AdminBackendHandler, ReadonlyBackendHandler, UserReadableBackendHandler,
             UserWriteableBackendHandler,
         },
-        graphql::api::field_error_callback,
+        graphql::api::{field_error_callback, Context},
     },
 };
 use anyhow::Context as AnyhowContext;
@@ -16,8 +19,6 @@ use base64::Engine;
 use juniper::{graphql_object, FieldResult, GraphQLInputObject, GraphQLObject};
 use tracing::{debug, debug_span, Instrument};
 
-use super::api::Context;
-
 #[derive(PartialEq, Eq, Debug)]
 /// The top-level GraphQL mutation type.
 pub struct Mutation<Handler: BackendHandler> {
@@ -126,7 +127,11 @@ impl<Handler: BackendHandler> Mutation<Handler> {
         let handler = context
             .get_admin_handler()
             .ok_or_else(field_error_callback(&span, "Unauthorized group creation"))?;
-        let group_id = handler.create_group(&name).await?;
+        let request = CreateGroupRequest {
+            display_name: name,
+            ..Default::default()
+        };
+        let group_id = handler.create_group(request).await?;
         Ok(handler
             .get_group_details(group_id)
             .instrument(span)
@@ -188,6 +193,8 @@ impl<Handler: BackendHandler> Mutation<Handler> {
             .update_group(UpdateGroupRequest {
                 group_id: GroupId(group.id),
                 display_name: group.display_name,
+                delete_attributes: Vec::new(),
+                insert_attributes: Vec::new(),
             })
             .instrument(span)
             .await?;

server/src/infra/test_utils.rs

@@ -20,7 +20,7 @@ mockall::mock! {
     impl GroupBackendHandler for TestBackendHandler {
         async fn get_group_details(&self, group_id: GroupId) -> Result<GroupDetails>;
         async fn update_group(&self, request: UpdateGroupRequest) -> Result<()>;
-        async fn create_group(&self, group_name: &str) -> Result<GroupId>;
+        async fn create_group(&self, request: CreateGroupRequest) -> Result<GroupId>;
         async fn delete_group(&self, group_id: GroupId) -> Result<()>;
     }
     #[async_trait]