Merge branch 'staging' into 'log-2022'

# Conflicts:
#   src/model/logbook.rs

src/model/logbook.rs

@@ -1,4 +1,4 @@
-use chrono::{Datelike, NaiveDateTime};
+use chrono::{NaiveDateTime, Utc, Datelike};
 use rocket::FromForm;
 use serde::Serialize;
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
@@ -99,6 +99,7 @@ pub enum LogbookUpdateError {
     ShipmasterNotInRowers,
     SteeringPersonNotInRowers,
     UserNotAllowedToUseBoat,
+    OnlyAllowedToEndTripsEndingToday,
 }
 
 #[derive(Debug, PartialEq)]
@@ -120,6 +121,7 @@ pub enum LogbookCreateError {
     ShipmasterNotInRowers,
     NotYourEntry,
     ArrivalSetButNotRemainingTwo,
+    OnlyAllowedToEndTripsEndingToday,
 }
 
 impl From<LogbookUpdateError> for LogbookCreateError {
@@ -140,6 +142,9 @@ impl From<LogbookUpdateError> for LogbookCreateError {
             LogbookUpdateError::UserNotAllowedToUseBoat => {
                 LogbookCreateError::UserNotAllowedToUseBoat
             }
+            LogbookUpdateError::OnlyAllowedToEndTripsEndingToday => {
+                LogbookCreateError::OnlyAllowedToEndTripsEndingToday
+            }
         }
     }
 }
@@ -446,13 +451,8 @@ ORDER BY departure DESC
         }
 
         if !boat.shipmaster_allowed(user).await && self.shipmaster != user.id {
-            //second part:
-            //shipmaster has
-            //entered a
-            //different user,
-            //then the user
-            //should be able
-            //to `home` it
+            //second part: shipmaster has entered a different user, then the user should be able to
+            //`home` it
             return Err(LogbookUpdateError::UserNotAllowedToUseBoat);
         }
 
@@ -468,6 +468,10 @@ ORDER BY departure DESC
         if arr.timestamp() <= dep.timestamp() {
             return Err(LogbookUpdateError::ArrivalNotAfterDeparture);
         }
+        let today = Utc::now().date_naive();
+        if arr.date() != today && !user.is_admin {
+            return Err(LogbookUpdateError::OnlyAllowedToEndTripsEndingToday);
+        }
 
         Log::create_with_tx(db, format!("New trip: {log:?}")).await;
 
@@ -793,6 +797,8 @@ mod test {
         let logbook = Logbook::find_by_id(&pool, 1).await.unwrap();
         let user = User::find_by_id(&pool, 2).await.unwrap();
 
+        let current_date = chrono::Local::now().format("%Y-%m-%d").to_string();
+
         logbook
             .home(
                 &pool,
@@ -806,8 +812,8 @@ mod test {
                     shipmaster: Some(2),
                     steering_person: Some(2),
                     shipmaster_only_steering: false,
-                    departure: "1990-01-01T10:00".into(),
-                    arrival: "1990-01-01T12:00".into(),
+                    departure: format!("{}T10:00", current_date),
+                    arrival: format!("{}T12:00", current_date),
                 },
             )
             .await