Genealogy as a feature (#175)

Start our journey into turning GeneIT as afully featured family intranet by making genealogy a feature that can be disabled by family admins

Reviewed-on: #175

geneit_backend/src/controllers/families_controller.rs

@@ -79,6 +79,7 @@ pub async fn list(token: LoginToken) -> HttpResult {
 struct RichFamilyInfo {
     #[serde(flatten)]
     membership: FamilyMembership,
+    enable_genealogy: bool,
     disable_couple_photos: bool,
 }
 
@@ -88,6 +89,7 @@ pub async fn single_info(f: FamilyInPath) -> HttpResult {
     let family = families_service::get_by_id(f.family_id()).await?;
     Ok(HttpResponse::Ok().json(RichFamilyInfo {
         membership,
+        enable_genealogy: family.enable_genealogy,
         disable_couple_photos: family.disable_couple_photos,
     }))
 }
@@ -101,8 +103,9 @@ pub async fn leave(f: FamilyInPath) -> HttpResult {
 
 #[derive(serde::Deserialize)]
 pub struct UpdateFamilyBody {
-    name: String,
-    disable_couple_photos: bool,
+    name: Option<String>,
+    enable_genealogy: Option<bool>,
+    disable_couple_photos: Option<bool>,
 }
 
 /// Update a family
@@ -110,16 +113,24 @@ pub async fn update(
     f: FamilyInPathWithAdminMembership,
     req: web::Json<UpdateFamilyBody>,
 ) -> HttpResult {
-    if !StaticConstraints::default()
-        .family_name_len
-        .validate(&req.name)
-    {
-        return Ok(HttpResponse::BadRequest().body("Invalid family name!"));
+    let mut family = families_service::get_by_id(f.family_id()).await?;
+
+    if let Some(name) = &req.name {
+        if !StaticConstraints::default().family_name_len.validate(name) {
+            return Ok(HttpResponse::BadRequest().body("Invalid family name!"));
+        }
+
+        family.name = name.to_string();
+    }
+
+    if let Some(enable_genealogy) = req.enable_genealogy {
+        family.enable_genealogy = enable_genealogy;
+    }
+
+    if let Some(disable_couple_photos) = req.disable_couple_photos {
+        family.disable_couple_photos = disable_couple_photos;
     }
 
-    let mut family = families_service::get_by_id(f.family_id()).await?;
-    family.name = req.0.name;
-    family.disable_couple_photos = req.0.disable_couple_photos;
     families_service::update_family(&family).await?;
 
     log::info!("User {:?} updated family {:?}", f.user_id(), f.family_id());

geneit_backend/src/main.rs

@@ -137,71 +137,71 @@ async fn main() -> std::io::Result<()> {
                 "/family/{id}/user/{user_id}",
                 web::delete().to(families_controller::delete_membership),
             )
-            // Members controller
+            // [GENEALOGY] Members controller
             .route(
-                "/family/{id}/member/create",
+                "/family/{id}/genealogy/member/create",
                 web::post().to(members_controller::create),
             )
             .route(
-                "/family/{id}/members",
+                "/family/{id}/genealogy/members",
                 web::get().to(members_controller::get_all),
             )
             .route(
-                "/family/{id}/member/{member_id}",
+                "/family/{id}/genealogy/member/{member_id}",
                 web::get().to(members_controller::get_single),
             )
             .route(
-                "/family/{id}/member/{member_id}",
+                "/family/{id}/genealogy/member/{member_id}",
                 web::put().to(members_controller::update),
             )
             .route(
-                "/family/{id}/member/{member_id}",
+                "/family/{id}/genealogy/member/{member_id}",
                 web::delete().to(members_controller::delete),
             )
             .route(
-                "/family/{id}/member/{member_id}/photo",
+                "/family/{id}/genealogy/member/{member_id}/photo",
                 web::put().to(members_controller::set_photo),
             )
             .route(
-                "/family/{id}/member/{member_id}/photo",
+                "/family/{id}/genealogy/member/{member_id}/photo",
                 web::delete().to(members_controller::remove_photo),
             )
-            // Couples controller
+            // [GENEALOGY] Couples controller
             .route(
-                "/family/{id}/couple/create",
+                "/family/{id}/genealogy/couple/create",
                 web::post().to(couples_controller::create),
             )
             .route(
-                "/family/{id}/couples",
+                "/family/{id}/genealogy/couples",
                 web::get().to(couples_controller::get_all),
             )
             .route(
-                "/family/{id}/couple/{couple_id}",
+                "/family/{id}/genealogy/couple/{couple_id}",
                 web::get().to(couples_controller::get_single),
             )
             .route(
-                "/family/{id}/couple/{couple_id}",
+                "/family/{id}/genealogy/couple/{couple_id}",
                 web::put().to(couples_controller::update),
             )
             .route(
-                "/family/{id}/couple/{couple_id}",
+                "/family/{id}/genealogy/couple/{couple_id}",
                 web::delete().to(couples_controller::delete),
             )
             .route(
-                "/family/{id}/couple/{couple_id}/photo",
+                "/family/{id}/genealogy/couple/{couple_id}/photo",
                 web::put().to(couples_controller::set_photo),
             )
             .route(
-                "/family/{id}/couple/{couple_id}/photo",
+                "/family/{id}/genealogy/couple/{couple_id}/photo",
                 web::delete().to(couples_controller::remove_photo),
             )
-            // Data controller
+            // [GENEALOGY] Data controller
             .route(
-                "/family/{id}/data/export",
+                "/family/{id}/genealogy/data/export",
                 web::get().to(data_controller::export_family),
             )
             .route(
-                "/family/{id}/data/import",
+                "/family/{id}/genealogy/data/import",
                 web::put().to(data_controller::import_family),
             )
             // Photos controller

geneit_backend/src/models.rs

@@ -65,6 +65,7 @@ pub struct Family {
     pub name: String,
     pub invitation_code: String,
     pub disable_couple_photos: bool,
+    pub enable_genealogy: bool,
 }
 
 impl Family {

geneit_backend/src/schema.rs

@@ -29,6 +29,7 @@ diesel::table! {
         #[max_length = 7]
         invitation_code -> Varchar,
         disable_couple_photos -> Bool,
+        enable_genealogy -> Bool,
     }
 }
 

geneit_backend/src/services/families_service.rs

@@ -174,6 +174,7 @@ pub async fn update_family(family: &Family) -> anyhow::Result<()> {
             .set((
                 families::dsl::name.eq(family.name.clone()),
                 families::dsl::invitation_code.eq(family.invitation_code.clone()),
+                families::dsl::enable_genealogy.eq(family.enable_genealogy),
                 families::dsl::disable_couple_photos.eq(family.disable_couple_photos),
             ))
             .execute(conn)