allow reimport of groups

Author: fiji-flo

src/api/admins.rs

@@ -54,7 +54,7 @@ pub async fn downgrade(
     let (group_name, user_uuid) = path.into_inner();
     let host = operations::users::user_by_id(&pool, &scope_and_user.user_id)?;
     let user = User { user_uuid };
-    log::info!("donwgrade");
+    log::info!("downgrade");
     operations::admins::demote(
         &pool,
         &scope_and_user,

src/import/ops.rs

@@ -50,6 +50,9 @@ pub fn import_group(
     moz_group: MozilliansGroup,
     trust: TrustType,
 ) -> Result<(), Error> {
+    if internal::group::get_group(connection, &moz_group.name).is_ok() {
+        return Ok(());
+    }
     let group_name = moz_group.name.clone();
     let description = match (moz_group.website.as_str(), moz_group.wiki.as_str()) {
         ("", "") => moz_group.description,

tests/api/import.rs

@@ -17,7 +17,7 @@ use failure::format_err;
 use failure::Error;
 use std::sync::Arc;
 
-fn members() -> Result<Vec<MozilliansGroupMembership>, Error> {
+fn get_members() -> Result<Vec<MozilliansGroupMembership>, Error> {
     let mut rdr = ReaderBuilder::new()
         .delimiter(b'\t')
         .from_path("tests/data/import-test/m.tsv")?;
@@ -27,7 +27,7 @@ fn members() -> Result<Vec<MozilliansGroupMembership>, Error> {
         .map_err(Into::into)
 }
 
-fn curators() -> Result<Vec<MozilliansGroupCurator>, Error> {
+fn get_curators() -> Result<Vec<MozilliansGroupCurator>, Error> {
     let mut rdr = ReaderBuilder::new()
         .delimiter(b'\t')
         .from_path("tests/data/import-test/c.tsv")?;
@@ -37,7 +37,7 @@ fn curators() -> Result<Vec<MozilliansGroupCurator>, Error> {
         .map_err(Into::into)
 }
 
-fn group() -> Result<MozilliansGroup, Error> {
+fn get_group() -> Result<MozilliansGroup, Error> {
     let mut rdr = ReaderBuilder::new()
         .delimiter(b'\t')
         .from_path("tests/data/import-test/g.tsv")?;
@@ -56,9 +56,9 @@ async fn import() -> Result<(), Error> {
     let app = App::new().service(service);
     let mut app = test::init_service(app).await;
     let creator = Soa::from(&basic_user(1, true)).creator().aal_medium();
-    let group = group()?;
-    let curators = curators()?;
-    let members = members()?;
+    let group = get_group()?;
+    let curators = get_curators()?;
+    let members = get_members()?;
     let connection = get_pool().get()?;
     import_group(&connection, group, TrustType::Authenticated)?;
     import_curators(
@@ -175,9 +175,9 @@ async fn import_staff_only() -> Result<(), Error> {
     let app = App::new().service(service);
     let mut app = test::init_service(app).await;
     let creator = Soa::from(&basic_user(1, true)).creator().aal_medium();
-    let group = group()?;
-    let curators = curators()?;
-    let members = members()?;
+    let group = get_group()?;
+    let curators = get_curators()?;
+    let members = get_members()?;
     let connection = get_pool().get()?;
     import_group(&connection, group, TrustType::Staff)?;
     import_curators(
@@ -283,5 +283,7 @@ async fn import_staff_only() -> Result<(), Error> {
     let j = read_json(res).await;
     assert_eq!(j["group"]["created"], "2011-03-22T00:00:00Z");
 
+    let group = get_group()?;
+    import_group(&connection, group, TrustType::Staff)?;
     Ok(())
 }