From 8c977ca0af0417ee6de376e41415d6e16e04fbee Mon Sep 17 00:00:00 2001
From: realaravinth <realaravinth@batsense.net>
Date: Thu, 14 Oct 2021 14:43:22 +0530
Subject: [PATCH] scope survey routes to /survey/

---
 Makefile                      | 4 ++--
 src/api/v1/admin/campaigns.rs | 2 +-
 src/api/v1/bench.rs           | 8 ++++----
 src/main.rs                   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 6ccfd2c..97c4c06 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 default: frontend ## Debug build
-	cargo run
+	cargo build
 
 clean: ## Clean all build artifacts and dependencies
 	@cargo clean
@@ -29,7 +29,7 @@ docker-publish: docker ## Build and publish docker images
 frontend: ## Build frontend assets
 	@yarn install
 	@-rm -rf ./static/cache/bundle/
-	@-mkdir ./static/cache/bundle/css/
+	@-mkdir -p ./static/cache/bundle/css/
 	@yarn sass
 	@yarn build
 	@./scripts/bundle.sh
diff --git a/src/api/v1/admin/campaigns.rs b/src/api/v1/admin/campaigns.rs
index 8525829..e8b4412 100644
--- a/src/api/v1/admin/campaigns.rs
+++ b/src/api/v1/admin/campaigns.rs
@@ -48,7 +48,7 @@ pub mod routes {
         //        }
 
         pub fn get_delete_route(&self, campaign_id: &str) -> String {
-            self.delete.replace("{uuid}", &campaign_id)
+            self.delete.replace("{uuid}", campaign_id)
         }
     }
 }
diff --git a/src/api/v1/bench.rs b/src/api/v1/bench.rs
index e50586d..9f8ece3 100644
--- a/src/api/v1/bench.rs
+++ b/src/api/v1/bench.rs
@@ -60,10 +60,10 @@ pub mod routes {
 
     impl Benches {
         pub const fn new() -> Benches {
-            let submit = "/api/v1/benches/{campaign_id}/submit";
-            let fetch = "/api/v1/benches/{campaign_id}/fetch";
-            let register = "/api/v1/benches/register";
-            let scope = "/api/v1/benches/";
+            let submit = "/survey/api/v1/benches/{campaign_id}/submit";
+            let fetch = "/survey/api/v1/benches/{campaign_id}/fetch";
+            let register = "/survey/api/v1/benches/register";
+            let scope = "/survey/api/v1/benches/";
             Benches {
                 submit,
                 register,
diff --git a/src/main.rs b/src/main.rs
index cc8d22a..db1deb6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -137,7 +137,7 @@ pub fn get_survey_identity_service() -> IdentityService<CookieIdentityPolicy> {
     IdentityService::new(
         CookieIdentityPolicy::new(cookie_secret.as_bytes())
             .name("survey-id")
-            .path(V1_API_ROUTES.benches.scope)
+            .path("/survey")
             .max_age_secs(30 * 60)
             .domain(&SETTINGS.server.domain)
             .secure(false),