- Store survey data in new table without user mapping

- Return Forbidden if the user has already submitted a survey
- Increase version to 1.5.1

Author: njbirth

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "smartbeans-backend"
-version = "1.5.0"
+version = "1.5.1"
 authors = ["Niklas Birth <[email protected]>"]
 edition = "2018"
 default-run = "backend"

Cargo.toml

@@ -0,0 +1 @@
+DROP TABLE survey

migrations/2021-03-24-104952_add_survey_table/down.sql

@@ -0,0 +1,4 @@
+CREATE TABLE survey (
+    id             INTEGER PRIMARY KEY AUTO_INCREMENT   NOT NULL,
+    val            TEXT                                 NOT NULL
+)

migrations/2021-03-24-104952_add_survey_table/up.sql

@@ -25,16 +25,10 @@ pub fn get_userdata(user: guards::User) -> Json<Value> {
         .first(&conn)
         .expect("Database error");
 
-    let survey_completed = users.filter(username.eq(&user.name))
-        .select(survey)
-        .first::<Option<String>>(&conn)
-        .expect("Database error")
-        .is_some();
-
     Json(json!({
         "username": user.name,
         "first_login": the_first_login_that_is_not_the_table_column,
-        "survey_completed": survey_completed
+        "survey_completed": survey_completed(&user.name)
     }))
 }
 
@@ -53,16 +47,40 @@ pub fn first_login_done(user: guards::User) -> Status {
 
 #[post("/user/submit_survey", format = "text/plain", data = "<data>")]
 pub fn submit_survey(user: guards::User, data: rocket::Data) -> Status {
-    use crate::schema::users::dsl::*;
+    if survey_completed(&user.name) {
+        return Status::Forbidden;
+    }
 
-    diesel::update(users.filter(username.eq(&user.name)))
-        .set(survey.eq(crate::data_to_string(data)))
-        .execute(&crate::database::establish_connection())
-        .expect("Database error");
+    let conn = crate::database::establish_connection();
+
+    {
+        use crate::schema::users::dsl::*;
+        diesel::update(users.filter(username.eq(&user.name)))
+            .set(survey.eq("1"))
+            .execute(&conn)
+            .expect("Database error");
+    }
+
+    {
+        use crate::schema::survey::dsl::*;
+        diesel::insert_into(survey)
+            .values(val.eq(crate::data_to_string(data)))
+            .execute(&conn)
+            .expect("Database error");
+    }
 
     Status::Ok
 }
 
+fn survey_completed(uname: &str) -> bool {
+    use crate::schema::users::dsl::*;
+    users.filter(username.eq(uname))
+        .select(survey)
+        .first::<Option<String>>(&crate::database::establish_connection())
+        .expect("Database error")
+        .is_some()
+}
+
 #[get("/level_data")]
 pub fn level_data(user: guards::User) -> Result<Json<Value>, Status> {
     let userdata = level::user_points(&user)?;

src/routes/user.rs

@@ -61,6 +61,13 @@ table! {
     }
 }
 
+table! {
+    survey (id) {
+        id -> Integer,
+        val -> Text,
+    }
+}
+
 table! {
     system_messages (id) {
         id -> Integer,
@@ -90,6 +97,7 @@ allow_tables_to_appear_in_same_query!(
     error_reports,
     route_log,
     sessions,
+    survey,
     system_messages,
     users,
 );