add compare to /v1/mods/{id}/versions

Author: Fleeym

src/endpoints/mod_versions.rs

@@ -1,15 +1,17 @@
 use std::str::FromStr;
 
 use actix_web::{dev::ConnectionInfo, get, post, put, web, HttpResponse, Responder};
+use semver::Version;
 use serde::Deserialize;
 use sqlx::{types::ipnetwork::IpNetwork, Acquire};
 
 use crate::{
     extractors::auth::Auth,
     types::{
         api::{ApiError, ApiResponse},
-        mod_json::ModJson,
+        mod_json::{split_version_and_compare, ModJson},
         models::{
+            dependency::ModVersionCompare,
             developer::Developer,
             download,
             mod_entity::{download_geode_file, Mod},
@@ -69,6 +71,7 @@ struct IndexQuery {
     gd: Option<GDVersionEnum>,
     platforms: Option<String>,
     status: Option<ModVersionStatusEnum>,
+    compare: Option<String>,
 }
 
 #[get("v1/mods/{id}/versions")]
@@ -78,12 +81,25 @@ pub async fn get_version_index(
     query: web::Query<IndexQuery>,
 ) -> Result<impl Responder, ApiError> {
     let platforms = VerPlatform::parse_query_string(&query.platforms.clone().unwrap_or_default());
+    let compare = query.compare.as_ref().map(|c| split_version_and_compare(c));
+
+    if compare.is_some() && compare.as_ref().unwrap().is_err() {
+        return Err(ApiError::BadRequest(format!(
+            "Bad compare string {}",
+            query.compare.as_ref().unwrap()
+        )));
+    }
+
+    let compare = compare.map(|x| x.unwrap());
+
     let mut pool = data.db.acquire().await.or(Err(ApiError::DbAcquireError))?;
+
     let mut result = ModVersion::get_index(
         mod_version::IndexQuery {
             mod_id: path.id.clone(),
             page: query.page.unwrap_or(1),
             per_page: query.per_page.unwrap_or(10),
+            compare,
             gd: query.gd,
             platforms,
             status: query.status.unwrap_or(ModVersionStatusEnum::Accepted),

src/types/mod_json.rs

@@ -385,7 +385,7 @@ fn validate_dependency_version_str(ver: &str) -> bool {
     result.is_ok()
 }
 
-fn split_version_and_compare(ver: &str) -> Result<(Version, ModVersionCompare), ()> {
+pub fn split_version_and_compare(ver: &str) -> Result<(Version, ModVersionCompare), ()> {
     let mut copy = ver.to_string();
     let mut compare = ModVersionCompare::MoreEq;
     if ver.starts_with("<=") {

src/types/models/mod_version.rs

@@ -10,7 +10,7 @@ use crate::types::{
 };
 
 use super::{
-    dependency::{Dependency, ResponseDependency},
+    dependency::{Dependency, ModVersionCompare, ResponseDependency},
     developer::Developer,
     incompatibility::{Incompatibility, ResponseIncompatibility},
     mod_gd_version::{DetailedGDVersion, GDVersionEnum, ModGDVersion, VerPlatform},
@@ -61,6 +61,7 @@ pub struct IndexQuery {
     pub page: i64,
     pub per_page: i64,
     pub gd: Option<GDVersionEnum>,
+    pub compare: Option<(semver::Version, ModVersionCompare)>,
     pub platforms: Vec<VerPlatform>,
     pub status: ModVersionStatusEnum,
 }
@@ -165,7 +166,31 @@ impl ModVersion {
             q.push(") ");
             counter_q.push(") ");
         }
-        let sql = "GROUP BY mv.id, mvs.status LIMIT ";
+
+        if let Some(c) = query.compare {
+            let sql = "AND SPLIT_PART(mv.version, '.', 1) = ";
+            q.push(sql);
+            counter_q.push(sql);
+            let major = c.0.major.to_string();
+            q.push_bind(major.clone());
+            counter_q.push_bind(major.clone());
+            let sql = " AND semver_compare(mv.version, ";
+            q.push(sql);
+            counter_q.push(sql);
+            q.push_bind(c.0.to_string());
+            counter_q.push_bind(c.0.to_string());
+            let sql = match c.1 {
+                ModVersionCompare::Exact => ") = 0",
+                ModVersionCompare::Less => ") = -1",
+                ModVersionCompare::LessEq => ") <= 0",
+                ModVersionCompare::More => ") = 1",
+                ModVersionCompare::MoreEq => ") >= 0",
+            };
+            q.push(sql);
+            counter_q.push(sql);
+        }
+
+        let sql = "GROUP BY mv.id, mvs.status ORDER BY mv.id DESC LIMIT ";
         q.push(sql);
         q.push_bind(limit);
         let sql = " OFFSET ";