fix(mods): move dev assign / unassign to repository module

Author: Fleeym

.sqlx/query-16469aa4a91fd0c6e55b56b3ae1bdbcd907942f510fe3f16683abd6f0429c86a.json

@@ -142,6 +142,33 @@ pub async fn assign_developer(
     Ok(())
 }
 
+pub async fn unassign_developer(
+    id: &str,
+    developer_id: i32,
+    conn: &mut PgConnection,
+) -> Result<(), ApiError> {
+    sqlx::query!(
+        "DELETE FROM mods_developers
+        WHERE mod_id = $1
+        AND developer_id = $2",
+        id,
+        developer_id
+    )
+    .execute(conn)
+    .await
+    .inspect_err(|x| {
+        log::error!(
+            "Couldn't unassign developer {} from mod {}: {}",
+            developer_id,
+            id,
+            x
+        )
+    })
+    .or(Err(ApiError::DbError))?;
+
+    Ok(())
+}
+
 pub async fn is_featured(id: &str, conn: &mut PgConnection) -> Result<bool, ApiError> {
     Ok(sqlx::query!("SELECT featured FROM mods WHERE id = $1", id)
         .fetch_optional(&mut *conn)

.sqlx/query-1dab289f4e73713483b43887079957a6e93fc67e2ff5295a892f8968fba3f085.json

@@ -116,7 +116,7 @@ pub async fn add_developer_to_mod(
             json.username
         )))?;
 
-    Mod::assign_dev(&path.id, target.id, &mut pool).await?;
+    mods::assign_developer(&path.id, target.id, false, &mut pool).await?;
 
     Ok(HttpResponse::NoContent())
 }
@@ -149,9 +149,23 @@ pub async fn remove_dev_from_mod(
             path.username
         )))?;
 
-    Mod::unassign_dev(&path.id, target.id, &mut pool).await?;
+    if target.id == dev.id {
+        return Ok(HttpResponse::Conflict().json(ApiResponse {
+            error: "Cannot remove self from mod developer list".into(),
+            payload: "",
+        }));
+    }
 
-    Ok(HttpResponse::NoContent())
+    if !developers::has_access_to_mod(target.id, &path.id, &mut pool).await? {
+        return Ok(HttpResponse::NotFound().json(ApiResponse {
+            error: format!("{} is not a developer for this mod", target.username),
+            payload: "",
+        }));
+    }
+
+    mods::unassign_developer(&path.id, target.id, &mut pool).await?;
+
+    Ok(HttpResponse::NoContent().finish())
 }
 
 #[delete("v1/me/token")]
@@ -207,7 +221,11 @@ pub async fn update_profile(
         .await
         .or(Err(ApiError::DbAcquireError))?;
 
-    if !json.display_name.chars().all(|x| char::is_ascii_alphanumeric(&x)) {
+    if !json
+        .display_name
+        .chars()
+        .all(|x| char::is_ascii_alphanumeric(&x))
+    {
         return Err(ApiError::BadRequest(
             "Display name must contain only ASCII alphanumeric characters".into(),
         ));

.sqlx/query-432b742a413480d86a0150b28de79f385cabbffd90ff5458ceda3ee10416858f.json

@@ -649,111 +649,6 @@ impl Mod {
         Ok(())
     }
 
-    pub async fn assign_dev(
-        mod_id: &str,
-        dev_id: i32,
-        pool: &mut PgConnection,
-    ) -> Result<(), ApiError> {
-        struct FetchedRow {
-            developer_id: i32,
-            is_owner: bool,
-        }
-
-        let assignment = sqlx::query_as!(
-            FetchedRow,
-            "SELECT md.developer_id, md.is_owner FROM mods_developers md
-            WHERE md.mod_id = $1
-            AND md.developer_id = $2",
-            mod_id,
-            dev_id
-        )
-        .fetch_optional(&mut *pool)
-        .await
-        .map_err(|e| {
-            log::error!(
-                "Failed to fetch existing dev for assignment on mod {}: {}",
-                mod_id,
-                e
-            );
-            ApiError::DbError
-        })?;
-        if assignment.is_some() {
-            return Err(ApiError::BadRequest(format!(
-                "This developer is already assigned on mod {}",
-                mod_id
-            )));
-        }
-
-        sqlx::query!(
-            "INSERT INTO mods_developers (mod_id, developer_id)
-            VALUES ($1, $2)",
-            mod_id,
-            dev_id
-        )
-        .execute(&mut *pool)
-        .await
-        .map_err(|e| {
-            log::error!("Couldn't add new developer to mod {}: {}", mod_id, e);
-            ApiError::DbError
-        })?;
-        Ok(())
-    }
-
-    pub async fn unassign_dev(
-        mod_id: &str,
-        dev_id: i32,
-        pool: &mut PgConnection,
-    ) -> Result<(), ApiError> {
-        struct FetchedRow {
-            developer_id: i32,
-            is_owner: bool,
-        }
-
-        let existing = sqlx::query_as!(
-            FetchedRow,
-            "SELECT md.developer_id, md.is_owner FROM mods_developers md
-            WHERE md.mod_id = $1
-            AND md.developer_id = $2",
-            mod_id,
-            dev_id
-        )
-        .fetch_optional(&mut *pool)
-        .await
-        .map_err(|err| {
-            log::error!("Failed to fetch existing developers: {}", err);
-            ApiError::DbError
-        })?
-        .ok_or(ApiError::NotFound(
-            "Developer is not assigned to mod".into(),
-        ))?;
-
-        if existing.is_owner {
-            return Err(ApiError::BadRequest(
-                "Cannot unassign the owner developer for the mod".to_string(),
-            ));
-        }
-
-        sqlx::query!(
-            "DELETE FROM mods_developers
-            WHERE mod_id = $1 AND developer_id = $2",
-            mod_id,
-            dev_id
-        )
-        .execute(&mut *pool)
-        .await
-        .map_err(|e| {
-            log::error!(
-                "Failed to remove assigned developer {} from mod {}: {}",
-                dev_id,
-                mod_id,
-                e
-            );
-            ApiError::DbError
-        })?;
-
-        Ok(())
-    }
-
     pub async fn get_updates(
         ids: &[String],
         platforms: VerPlatform,