From bca70e2d5be3b731136e30c9bf02508a15530271 Mon Sep 17 00:00:00 2001
From: Katalina Okano <git2@kat.cafe>
Date: Sun, 5 Mar 2023 11:34:16 -0500
Subject: [PATCH] fix faction IDs

---
 .gitignore                     |  2 ++
 services/api/src/classes.rs    | 11 +++++++----
 services/api/src/factions.rs   |  4 ++++
 services/api/src/main.rs       |  1 +
 services/api/src/population.rs | 13 ++++++++-----
 services/api/src/vehicles.rs   | 11 +++++++----
 6 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 services/api/src/factions.rs

diff --git a/.gitignore b/.gitignore
index ea8c4bf..7dc35cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /target
+.DS_Store
+*/.DS_Store
\ No newline at end of file
diff --git a/services/api/src/classes.rs b/services/api/src/classes.rs
index 8629bfd..95817cd 100644
--- a/services/api/src/classes.rs
+++ b/services/api/src/classes.rs
@@ -1,4 +1,7 @@
-use crate::utils::{Filters, IdOrNameBy};
+use crate::{
+    factions::{NC, TR, VS},
+    utils::{Filters, IdOrNameBy},
+};
 use async_graphql::{Context, Object};
 use sqlx::{Pool, Postgres, Row};
 
@@ -39,7 +42,7 @@ impl Class {
         self.fetch(
             ctx,
             Filters {
-                faction: Some(IdOrNameBy::Id(1)),
+                faction: Some(IdOrNameBy::Id(NC)),
                 ..self.filters.clone()
             },
         )
@@ -49,7 +52,7 @@ impl Class {
         self.fetch(
             ctx,
             Filters {
-                faction: Some(IdOrNameBy::Id(2)),
+                faction: Some(IdOrNameBy::Id(TR)),
                 ..self.filters.clone()
             },
         )
@@ -59,7 +62,7 @@ impl Class {
         self.fetch(
             ctx,
             Filters {
-                faction: Some(IdOrNameBy::Id(3)),
+                faction: Some(IdOrNameBy::Id(VS)),
                 ..self.filters.clone()
             },
         )
diff --git a/services/api/src/factions.rs b/services/api/src/factions.rs
new file mode 100644
index 0000000..b542087
--- /dev/null
+++ b/services/api/src/factions.rs
@@ -0,0 +1,4 @@
+pub const VS: i32 = 1;
+pub const NC: i32 = 2;
+pub const TR: i32 = 3;
+pub const NSO: i32 = 4;
diff --git a/services/api/src/main.rs b/services/api/src/main.rs
index d9fc9f6..414b6fb 100644
--- a/services/api/src/main.rs
+++ b/services/api/src/main.rs
@@ -1,5 +1,6 @@
 mod analytics;
 mod classes;
+mod factions;
 mod health;
 mod population;
 mod query;
diff --git a/services/api/src/population.rs b/services/api/src/population.rs
index 4e7f9f7..0b4ee92 100644
--- a/services/api/src/population.rs
+++ b/services/api/src/population.rs
@@ -1,4 +1,7 @@
-use crate::utils::Filters;
+use crate::{
+    factions::{NC, NSO, TR, VS},
+    utils::Filters,
+};
 use async_graphql::{Context, Object};
 use sqlx::{Pool, Postgres, Row};
 
@@ -58,16 +61,16 @@ impl Population {
         query
     }
     async fn nc<'ctx>(&self, ctx: &Context<'ctx>) -> i64 {
-        self.by_faction(ctx, 1).await
+        self.by_faction(ctx, NC).await
     }
     async fn vs<'ctx>(&self, ctx: &Context<'ctx>) -> i64 {
-        self.by_faction(ctx, 2).await
+        self.by_faction(ctx, VS).await
     }
     async fn tr<'ctx>(&self, ctx: &Context<'ctx>) -> i64 {
-        self.by_faction(ctx, 3).await
+        self.by_faction(ctx, TR).await
     }
     async fn ns<'ctx>(&self, ctx: &Context<'ctx>) -> i64 {
-        self.by_faction(ctx, 4).await
+        self.by_faction(ctx, NSO).await
     }
 }
 
diff --git a/services/api/src/vehicles.rs b/services/api/src/vehicles.rs
index bf53dd2..c7facfa 100644
--- a/services/api/src/vehicles.rs
+++ b/services/api/src/vehicles.rs
@@ -1,4 +1,7 @@
-use crate::utils::{Filters, IdOrNameBy};
+use crate::{
+    factions::{NC, TR, VS},
+    utils::{Filters, IdOrNameBy},
+};
 use async_graphql::{Context, Object};
 use sqlx::{Pool, Postgres, Row};
 
@@ -39,7 +42,7 @@ impl Vehicle {
         self.fetch(
             ctx,
             Filters {
-                faction: Some(IdOrNameBy::Id(1)),
+                faction: Some(IdOrNameBy::Id(NC)),
                 ..self.filters.clone()
             },
         )
@@ -49,7 +52,7 @@ impl Vehicle {
         self.fetch(
             ctx,
             Filters {
-                faction: Some(IdOrNameBy::Id(2)),
+                faction: Some(IdOrNameBy::Id(TR)),
                 ..self.filters.clone()
             },
         )
@@ -59,7 +62,7 @@ impl Vehicle {
         self.fetch(
             ctx,
             Filters {
-                faction: Some(IdOrNameBy::Id(3)),
+                faction: Some(IdOrNameBy::Id(VS)),
                 ..self.filters.clone()
             },
         )