chore: bump rust version to 1.76

Reviewed-on: #1

.woodpecker/build.yml

@@ -5,7 +5,7 @@ branches:
 
 pipeline:
   build:
-    image: 'rust:1.69'
+    image: 'rust:1.76'
     commands:
       - cargo build --verbose
       - cargo test --verbose

.woodpecker/clippy.yml

@@ -5,7 +5,7 @@ branches:
 
 pipeline:
   clippy:
-    image: 'rust:1.69'
+    image: 'rust:1.76'
     commands:
       - rustup component add clippy
       - cargo clippy -- --no-deps -Dwarnings 

.woodpecker/deploy.yml

@@ -14,9 +14,9 @@ pipeline:
       - 'docker_username'
       - 'docker_password'
 
-  deploy:
-    image: 'curlimages/curl'
-    secrets:
-      - 'webhook'
-    commands:
-      - curl -XPOST --fail -s "$WEBHOOK"
+  # deploy:
+  #   image: 'curlimages/curl'
+  #   secrets:
+  #     - 'webhook'
+  #   commands:
+  #     - curl -XPOST --fail -s "$WEBHOOK"

.woodpecker/lint.yml

@@ -5,7 +5,7 @@ branches:
 
 pipeline:
   lint:
-    image: 'rust:1.69'
+    image: 'rust:1.76'
     commands:
       - rustup component add rustfmt
       - cargo fmt -- --check

Cargo.lock

@@ -23,9 +23,11 @@ name = "affluences-cli"
 version = "0.1.0"
 dependencies = [
  "affluences-api",
+ "chrono",
  "clap",
  "serde_json",
  "tokio",
+ "uuid",
 ]
 
 [[package]]

Cargo.toml

@@ -26,3 +26,10 @@ diesel = { version = "2.0.4", features = ["sqlite", "returning_clauses_for_sqlit
 diesel_migrations = { version = "2.0.0", features = [ "sqlite" ] }
 # Force sqlite3 to be bundled, allowing for a fully static binary
 libsqlite3-sys = { version = "*", features = ["bundled"] }
+
+# https://stackoverflow.com/a/54842093
+[profile.release]
+lto = true          # Enable link-time optimization
+codegen-units = 1   # Reduce number of codegen units to increase optimizations
+panic = 'abort'     # Abort on panic
+strip = true        # Strip symbols from binary*

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.69-alpine AS builder
+FROM rust:1.76-alpine AS builder
 
 ARG DI_VER=1.2.5
 
@@ -25,6 +25,9 @@ FROM busybox:1.36.0
 
 COPY --from=builder /build/dumb-init /build/affy/target/release/affy /bin/
 
+RUN mkdir /data && \
+    chown -R www-data:www-data /data
+
 WORKDIR /data
 
 ENV TZ=Europe/Brussels

affluences-api/src/models/available.rs

@@ -1,12 +1,19 @@
 use super::hh_mm_time_format;
 use chrono::{Duration, NaiveTime};
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Deserialize, Debug, Clone, Copy)]
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq)]
+#[serde(rename_all = "lowercase")]
+pub enum ResourceState {
+    Available,
+    Full,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, Copy)]
 pub struct HourBlock {
     #[serde(with = "hh_mm_time_format")]
     pub hour: NaiveTime,
-    pub state: u32,
+    pub state: ResourceState,
     // reservations
     pub granularity: u32,
     pub person_count: u32,
@@ -14,7 +21,7 @@ pub struct HourBlock {
     pub places_bookable: u32,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug)]
 pub struct Resource {
     pub resource_id: u32,
     pub resource_name: String,
@@ -38,7 +45,7 @@ pub struct Resource {
     // max_places_per_reservation
     pub image_url: Option<String>,
     // services
-    pub slots_state: u32,
+    pub slots_state: ResourceState,
     pub hours: Vec<HourBlock>,
 }
 
@@ -70,13 +77,18 @@ impl Resource {
     pub fn condensed_available_hours(&self) -> Vec<(&HourBlock, Duration)> {
         self.condensed_hours()
             .into_iter()
-            .filter(|(hour, _)| hour.state == 1)
+            .filter(|(hour, _)| hour.state == ResourceState::Available)
             .collect()
     }
 
     /// Returns whether a slot with the given state and time bounds is present in the list of
     /// hours.
-    pub fn has_slot(&self, start_time: NaiveTime, end_time: NaiveTime, state: u32) -> bool {
+    pub fn has_slot(
+        &self,
+        start_time: NaiveTime,
+        end_time: NaiveTime,
+        state: ResourceState,
+    ) -> bool {
         self.condensed_hours()
             .into_iter()
             .filter(|(block, _)| block.state == state)

affluences-cli/Cargo.toml

@@ -10,3 +10,5 @@ affluences-api = { path = "../affluences-api" }
 clap = { version = "4.2.7", features = ["derive"] }
 serde_json = "1.0.96"
 tokio = { version = "1.28.1", features = ["full"] }
+uuid = "*"
+chrono = "*"

affluences-cli/src/main.rs

@@ -1,5 +1,9 @@
 use affluences_api::AffluencesClient;
+use chrono::NaiveDate;
 use clap::{Parser, Subcommand};
+use uuid::{uuid, Uuid};
+
+const STERRE_BIB_ID: Uuid = uuid!("4737e57a-ee05-4f7b-901a-7bb541eeb297");
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
@@ -11,7 +15,10 @@ struct Cli {
 #[derive(Subcommand)]
 enum Commands {
     /// does testing things
-    SearchSite { query: String },
+    SearchSite {
+        query: String,
+    },
+    Available,
 }
 
 #[tokio::main]
@@ -25,6 +32,14 @@ async fn main() {
             let s = serde_json::to_string_pretty(&res).unwrap();
             println!("{}", s);
         }
+        Some(Commands::Available) => {
+            let res = client
+                .available(STERRE_BIB_ID, chrono::Utc::now().naive_utc().date(), 1)
+                .await
+                .unwrap();
+            let s = serde_json::to_string_pretty(&res).unwrap();
+            println!("{}", s);
+        }
         None => {}
     }
 }

build.rs

@@ -1,3 +1,3 @@
 fn main() {
-   println!("cargo:rerun-if-changed=migrations");
+    println!("cargo:rerun-if-changed=migrations");
 }

src/commands/bib.rs

@@ -2,7 +2,7 @@ use crate::commands::{EmbedField, HumanNaiveDate};
 use crate::db::users::User;
 use crate::{Context, Error};
 
-use affluences_api::{Reservation, Resource};
+use affluences_api::{Reservation, Resource, ResourceState};
 use chrono::{NaiveDate, NaiveTime};
 use uuid::{uuid, Uuid};
 
@@ -48,25 +48,22 @@ fn resource_to_embed_field(resource: Resource) -> EmbedField {
 #[poise::command(prefix_command, slash_command)]
 pub async fn available(ctx: Context<'_>, date: HumanNaiveDate) -> Result<(), Error> {
     let client = &ctx.data().client;
-    let mut resources = client
-        .available(STERRE_BIB_ID, date.clone().into(), 1)
-        .await?;
+    let date: NaiveDate = date.into();
+
+    let mut resources = client.available(STERRE_BIB_ID, date, 1).await?;
     // Cloning here isn't super efficient, but this list only consists of a handful of elements so
     // it's fine
     resources.sort_by_key(|k| k.resource_name.clone());
 
     ctx.send(|f| {
         f.embed(|e| {
-            e.description(format!(
-                "Available booking dates for {}.",
-                Into::<NaiveDate>::into(date)
-            ))
-            .fields(
-                resources
-                    .into_iter()
-                    .map(resource_to_embed_field)
-                    .collect::<Vec<EmbedField>>(),
-            )
+            e.description(format!("Available booking dates for {}.", date))
+                .fields(
+                    resources
+                        .into_iter()
+                        .map(resource_to_embed_field)
+                        .collect::<Vec<EmbedField>>(),
+                )
         })
     })
     .await?;
@@ -91,6 +88,7 @@ pub async fn book(
 
     let guild_id = ctx.guild_id().unwrap();
     let discord_id = ctx.author().id.0 as i64;
+    let date: NaiveDate = date.into();
 
     let user = {
         let mut conn = ctx.data().pool.get()?;
@@ -107,19 +105,17 @@ pub async fn book(
     let user = user.unwrap();
 
     let client = &ctx.data().client;
-    let resources = client
-        .available(STERRE_BIB_ID, date.clone().into(), 1)
-        .await?;
+    let resources = client.available(STERRE_BIB_ID, date, 1).await?;
     let chosen_resource = resources
         .iter()
         .filter(|r| capacity.is_none() || capacity.unwrap() <= r.capacity)
-        .find(|r| r.has_slot(start_time, end_time, 1));
+        .find(|r| r.has_slot(start_time, end_time, ResourceState::Available));
 
     if let Some(chosen_resource) = chosen_resource {
         let reservation = Reservation {
             auth_type: None,
             email: user.email.clone(),
-            date: date.clone().into(),
+            date,
             start_time,
             end_time,
             note: "coworking space".to_string(),
@@ -136,7 +132,7 @@ pub async fn book(
         ctx.send(|f| {
             f.embed(|e| {
                 e.description("A new reservation has been made.")
-                    .field("when", format!("{} {} - {}", Into::<NaiveDate>::into(date), start_time.format(TIME_FORMAT), end_time.format(TIME_FORMAT)), false)
+                    .field("when", format!("{} {} - {}", date, start_time.format(TIME_FORMAT), end_time.format(TIME_FORMAT)), false)
                     .field("where", &chosen_resource.resource_name, false)
                     .footer(|ft| ft.text(
                             format!("A confirmation mail has been sent to {}. Please check your email and confirm your reservation within two hours.", user.email)))