Fix a few things

Author: ilyvion

database/sqlx-data.json

@@ -459,70 +459,6 @@
       "nullable": []
     }
   },
-  "13d5c565c7c14d1ba739efd311e4a7cf9ec578109f95b56b10a2c89068ca53fc": {
-    "query": "\n                SELECT\n                    `item_id` AS `id`,\n                    MIN(`comic_id`) AS `first`,\n                    MAX(`comic_id`) AS `last`,\n                    COUNT(`comic_id`) AS `count`\n                FROM `Occurrence`\n                WHERE `item_id` = ?\n            ",
-    "describe": {
-      "columns": [
-        {
-          "ordinal": 0,
-          "name": "id",
-          "type_info": {
-            "type": "Short",
-            "flags": {
-              "bits": 4139
-            },
-            "char_set": 63,
-            "max_size": 6
-          }
-        },
-        {
-          "ordinal": 1,
-          "name": "first",
-          "type_info": {
-            "type": "Short",
-            "flags": {
-              "bits": 160
-            },
-            "char_set": 63,
-            "max_size": 6
-          }
-        },
-        {
-          "ordinal": 2,
-          "name": "last",
-          "type_info": {
-            "type": "Short",
-            "flags": {
-              "bits": 160
-            },
-            "char_set": 63,
-            "max_size": 6
-          }
-        },
-        {
-          "ordinal": 3,
-          "name": "count",
-          "type_info": {
-            "type": "LongLong",
-            "flags": {
-              "bits": 129
-            },
-            "char_set": 63,
-            "max_size": 21
-          }
-        }
-      ],
-      "parameters": {
-        "Right": 1
-      },
-      "nullable": [
-        false,
-        true,
-        true,
-        false
-      ]
-    }
-  },
   "1b5cd972500fdfed5f41fa9d48c232d45fc1043089147fb87513aef1006a3732": {
     "query": "\n                UPDATE `Comic`\n                SET\n                    `has_no_tagline` = ?\n                WHERE\n                    `id` = ?\n            ",
     "describe": {
@@ -2143,6 +2079,70 @@
       ]
     }
   },
+  "f95d8b69af9939012fd33a0fb2bc0f9865ea197736527470d82c16696bbbc33c": {
+    "query": "\n                SELECT\n                    `item_id` AS `id`,\n                    MIN(`comic_id`) AS `first`,\n                    MAX(`comic_id`) AS `last`,\n                    COUNT(`comic_id`) AS `count`\n                FROM `Occurrence`\n                WHERE `item_id` = ?\n                GROUP by `item_id`\n            ",
+    "describe": {
+      "columns": [
+        {
+          "ordinal": 0,
+          "name": "id",
+          "type_info": {
+            "type": "Short",
+            "flags": {
+              "bits": 4139
+            },
+            "char_set": 63,
+            "max_size": 6
+          }
+        },
+        {
+          "ordinal": 1,
+          "name": "first",
+          "type_info": {
+            "type": "Short",
+            "flags": {
+              "bits": 160
+            },
+            "char_set": 63,
+            "max_size": 6
+          }
+        },
+        {
+          "ordinal": 2,
+          "name": "last",
+          "type_info": {
+            "type": "Short",
+            "flags": {
+              "bits": 160
+            },
+            "char_set": 63,
+            "max_size": 6
+          }
+        },
+        {
+          "ordinal": 3,
+          "name": "count",
+          "type_info": {
+            "type": "LongLong",
+            "flags": {
+              "bits": 129
+            },
+            "char_set": 63,
+            "max_size": 21
+          }
+        }
+      ],
+      "parameters": {
+        "Right": 1
+      },
+      "nullable": [
+        false,
+        true,
+        true,
+        false
+      ]
+    }
+  },
   "f98f389b7de89f952e5c0b56a8389800b2f61c9bd26fef5e83c61d8d1be27251": {
     "query": "\n                SELECT `publish_date` FROM `Comic` WHERE `id` = ?\n            ",
     "describe": {

database/src/models/item.rs

@@ -127,6 +127,7 @@ impl Item {
                     COUNT(`comic_id`) AS `count`
                 FROM `Occurrence`
                 WHERE `item_id` = ?
+                GROUP by `item_id`
             "#,
             id
         )

src/controllers/api/comic/all.rs

@@ -26,9 +26,9 @@ pub(crate) async fn all(
 
 pub(crate) async fn excluded(
     pool: web::Data<DbPool>,
-    query: web::Query<AllQuery>,
+    query: web::Query<ExcludedQuery>,
 ) -> Result<HttpResponse> {
-    let (is_guest_comic, is_non_canon) = match query.exclude {
+    let (is_guest_comic, is_non_canon) = match query.exclusion {
         None => {
             return Err(error::ErrorBadRequest(
                 "exclude parameter must be set to either `guest` or `non-canon`",

src/controllers/api/log.rs

@@ -45,6 +45,7 @@ async fn get(
 
 #[derive(Debug, Deserialize)]
 struct LogQuery {
+    #[allow(unused)]
     token: Token,
     page: u16,
 }

src/main.rs

@@ -54,7 +54,7 @@
 // Warn (try not to do this)
 #![warn(clippy::must_use_candidate)]
 #![warn(clippy::enum_variant_names)]
-#![warn(clippy::shadow_unrelated)]
+//#![warn(clippy::shadow_unrelated)]
 #![warn(clippy::similar_names)]
 #![warn(clippy::too_many_lines)]
 // </editor-fold>

src/util.rs

@@ -1,6 +1,6 @@
 use actix_web_grants::permissions::{AuthDetails, PermissionsCheck};
 use anyhow::{anyhow, Result};
-use chrono::{DateTime, Datelike, NaiveDate, TimeZone, Timelike, Utc};
+use chrono::{DateTime, Datelike, TimeZone, Timelike, Utc};
 use futures::Future;
 use ilyvion_util::chrono::days_from_month_in_year;
 use ilyvion_util::string_extensions::StrExtensions;