[FEATURE] Feedback system

migrations/20240823213817_add_feedback.up.sql

@@ -8,10 +8,11 @@ CREATE TABLE mod_feedback
     id SERIAL PRIMARY KEY NOT NULL,
     mod_version_id INTEGER NOT NULL,
     reviewer_id INTEGER NOT NULL,
-    feedback TEXT COLLATE pg_catalog."default" NOT NULL DEFAULT 'No feedback provided.'::text,
+    feedback TEXT COLLATE pg_catalog."default" NOT NULL,
     decision BOOLEAN NOT NULL DEFAULT false,
     type feedback_type NOT NULL,
-    CONSTRAINT mod_feedback_mod_id_reviewer_id_key UNIQUE (mod_version_id, reviewer_id),
+    dev bool NOT NULL DEFAULT false,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
     CONSTRAINT mod_feedback_mod_version_id_fkey FOREIGN KEY (mod_version_id)
         REFERENCES public.mod_versions (id)
         ON DELETE CASCADE,

openapi.yml

@@ -681,8 +681,18 @@ paths:
                   description: The feedback given by the reviewer
                   example: "This mod is great!"
       responses:
-        "204":
-          description: No Content (Feedback added)
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
+                  payload:
+                    description: The ID of the new feedback (for use in deleting)
+                    type: integer
         "400":
           $ref: "#/components/responses/BadRequest"
         "401":
@@ -701,6 +711,16 @@ paths:
       parameters:
         - $ref: "#/components/parameters/ModID"
         - $ref: "#/components/parameters/ModVersion"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                id:
+                  type: integer
+                  description: The ID of the feedback to delete
+                  example: 1
       responses:
         "204":
           description: No Content (Feedback deleted)
@@ -1069,6 +1089,22 @@ components:
         admin:
           type: boolean
           description: Whether the reviewer is an admin
+        dev:
+          type: boolean
+          description: Whether the reviewer is a developer of the mod
+
+    Score:
+      type: object
+      properties:
+        score:
+          type: integer
+          description: The score of the mod, calculated as a sum of all feedback where positive is 1 and negative is -1
+        positive:
+          type: integer
+          description: The number of positive feedback
+        negative:
+          type: integer
+          description: The number of negative feedback
 
     ModFeedbackOne:
       type: object
@@ -1095,8 +1131,8 @@ components:
       type: object
       properties:
         score:
-          type: integer
-          description: The score of the mod, calculated as a sum of all feedback where positive is 1 and negative is -1
+          $ref: "#/components/schemas/Score"
+          description: The mod's score
         mod_id:
           $ref: "#/components/schemas/ModID"
         mod_version:

src/endpoints/mod_feedback.rs

@@ -14,7 +14,6 @@ use crate::{
 };
 use crate::types::models::mod_version::ModVersion;
 use crate::types::models::mod_feedback::{ModFeedback,FeedbackTypeEnum};
-use crate::types::models::mod_version_status::ModVersionStatusEnum;
 
 #[derive(Deserialize)]
 pub struct GetModFeedbackPath {
@@ -28,6 +27,11 @@ pub struct PostModFeedbackPayload {
     feedback: String,
 }
 
+#[derive(Deserialize)]
+pub struct DeleteModFeedbackPayload {
+    id: i32
+}
+
 #[get("/v1/mods/{id}/versions/{version}/feedback")]
 pub async fn get_mod_feedback(
     data: web::Data<AppData>,
@@ -43,14 +47,11 @@ pub async fn get_mod_feedback(
         return Err(ApiError::Forbidden);
     }
 
-    let mut note_only = false;
-    if !access && !dev.admin {
-        note_only = true;
-    }
+    let note_only = !access && !dev.admin;
 
     let mod_version = {
         if path.version == "latest" {
-            ModVersion::get_latest_for_mod(&path.id, None, vec![], None, vec![ModVersionStatusEnum::Accepted, ModVersionStatusEnum::Pending, ModVersionStatusEnum::Rejected, ModVersionStatusEnum::Unlisted], &mut pool).await?
+            ModVersion::get_latest_for_mod(&path.id, None, vec![], None, &mut pool).await?
         } else {
             ModVersion::get_one(path.id.strip_prefix('v').unwrap_or(&path.id), &path.version, false, false, &mut pool).await?
         }
@@ -85,19 +86,15 @@ pub async fn post_mod_feedback(
         return Err(ApiError::Forbidden);
     }
 
-    if !access && payload.feedback_type == FeedbackTypeEnum::Note {
-        return Err(ApiError::BadRequest("Only mod owners can leave notes".to_string()));
-    }
-
     let mod_version = {
         if path.version == "latest" {
-            ModVersion::get_latest_for_mod(&path.id, None, vec![], None, vec![ModVersionStatusEnum::Accepted, ModVersionStatusEnum::Pending, ModVersionStatusEnum::Rejected, ModVersionStatusEnum::Unlisted], &mut transaction).await?
+            ModVersion::get_latest_for_mod(&path.id, None, vec![], None, &mut transaction).await?
         } else {
             ModVersion::get_one(path.id.strip_prefix('v').unwrap_or(&path.id), &path.version, false, false, &mut transaction).await?
         }
     };
 
-    let result = ModFeedback::set(&mod_version, dev.id, payload.feedback_type.clone(), &payload.feedback, false, &mut transaction).await;
+    let result = ModFeedback::set(&mod_version, dev.id, payload.feedback_type.clone(), &payload.feedback, false, access, &mut transaction).await;
 
     if result.is_err() {
         transaction
@@ -112,34 +109,31 @@ pub async fn post_mod_feedback(
         .await
         .or(Err(ApiError::TransactionError))?;
 
-    Ok(HttpResponse::NoContent())
+    Ok(web::Json(ApiResponse {
+        error: "".to_string(),
+        payload: result?,
+    }))
 }
 
 #[delete("/v1/mods/{id}/versions/{version}/feedback")]
 pub async fn delete_mod_feedback(
     data: web::Data<AppData>,
     path: web::Path<GetModFeedbackPath>,
+    payload: web::Json<DeleteModFeedbackPayload>,
     auth: Auth,
 ) -> Result<impl Responder, ApiError> {
     let dev = auth.developer()?;
     let mut pool = data.db.acquire().await.or(Err(ApiError::DbAcquireError))?;
     let mut transaction = pool.begin().await.or(Err(ApiError::TransactionError))?;
 
-    let access = Developer::has_access_to_mod(dev.id, &path.id, &mut transaction).await?;
-
-    if !access && !dev.verified && !dev.admin {
-        return Err(ApiError::Forbidden);
-    }
-
-    let mod_version = {
-        if path.version == "latest" {
-            ModVersion::get_latest_for_mod(&path.id, None, vec![], None, vec![ModVersionStatusEnum::Accepted, ModVersionStatusEnum::Pending, ModVersionStatusEnum::Rejected, ModVersionStatusEnum::Unlisted], &mut transaction).await?
-        } else {
-            ModVersion::get_one(path.id.strip_prefix('v').unwrap_or(&path.id), &path.version, false, false, &mut transaction).await?
+    if !dev.admin {
+        let feedback = ModFeedback::get_feedback_by_id(payload.id, &mut transaction).await?;
+        if feedback.reviewer.id != dev.id {
+            return Err(ApiError::Forbidden);
         }
-    };
+    }
 
-    let result = ModFeedback::remove(&mod_version, dev.id, &mut transaction).await;
+    let result = ModFeedback::remove(payload.id, &mut transaction).await;
 
     if result.is_err() {
         transaction

src/endpoints/mod_versions.rs

@@ -149,7 +149,7 @@ pub async fn get_one(
             let platform_string = query.platforms.clone().unwrap_or_default();
             let platforms = VerPlatform::parse_query_string(&platform_string);
 
-            ModVersion::get_latest_for_mod(&path.id, gd, platforms, query.major, vec![ModVersionStatusEnum::Accepted], &mut pool).await?
+            ModVersion::get_latest_for_mod_statuses(&path.id, gd, platforms, query.major, vec![ModVersionStatusEnum::Accepted], &mut pool).await?
         } else {
             ModVersion::get_one(&path.id, &path.version, true, false, &mut pool).await?
         }
@@ -182,7 +182,7 @@ pub async fn download_version(
         if path.version == "latest" {
             let platform_str = query.platforms.clone().unwrap_or_default();
             let platforms = VerPlatform::parse_query_string(&platform_str);
-            ModVersion::get_latest_for_mod(&path.id, query.gd, platforms, query.major, vec![ModVersionStatusEnum::Accepted], &mut pool)
+            ModVersion::get_latest_for_mod_statuses(&path.id, query.gd, platforms, query.major, vec![ModVersionStatusEnum::Accepted], &mut pool)
                 .await?
         } else {
             ModVersion::get_one(&path.id, &path.version, false, false, &mut pool).await?
@@ -338,6 +338,7 @@ pub async fn update_version(
             feedback_type,
             payload.info.as_deref().unwrap_or_default(),
             true,
+            Developer::has_access_to_mod(dev.id, &version.mod_id, &mut transaction).await?,
             &mut transaction
         ).await {
             transaction