Compare commits

...

6 Commits

Author SHA1 Message Date
Jef Roosens 80f2bb8f0e
Merge branch 'dev' of git.rustybever.be:fossil/affluence into dev
ci/woodpecker/push/clippy Pipeline is pending Details
ci/woodpecker/push/lint Pipeline is pending Details
ci/woodpecker/push/build Pipeline failed Details
2024-02-15 14:02:55 +01:00
Jef Roosens 7fd6d55e71
fix: update serialization for new state string type 2024-02-15 14:00:09 +01:00
Jef Roosens 83e9d3e8cf
fix: writeable docker data directory
ci/woodpecker/push/build unknown status Details
ci/woodpecker/push/clippy unknown status Details
ci/woodpecker/push/lint unknown status Details
ci/woodpecker/push/deploy Pipeline was successful Details
2023-05-20 22:36:44 +02:00
Jef Roosens 7467b1f588
chore: conform linting
ci/woodpecker/push/build unknown status Details
ci/woodpecker/push/clippy unknown status Details
ci/woodpecker/push/lint unknown status Details
ci/woodpecker/push/deploy Pipeline failed Details
2023-05-20 21:19:11 +02:00
Jef Roosens c33cec3af5
feat: smaller binaries 2023-05-20 21:19:11 +02:00
Jef Roosens 1eef50c999 Merge pull request 'First merge' (#1) from dev into main
ci/woodpecker/push/build unknown status Details
ci/woodpecker/push/clippy unknown status Details
ci/woodpecker/push/lint unknown status Details
ci/woodpecker/push/deploy Pipeline failed Details
Reviewed-on: #1
2023-05-17 23:33:39 +02:00
7 changed files with 50 additions and 16 deletions

View File

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

2
Cargo.lock generated
View File

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

View File

@ -25,6 +25,9 @@ FROM busybox:1.36.0
COPY --from=builder /build/dumb-init /build/affy/target/release/affy /bin/ COPY --from=builder /build/dumb-init /build/affy/target/release/affy /bin/
RUN mkdir /data && \
chown -R www-data:www-data /data
WORKDIR /data WORKDIR /data
ENV TZ=Europe/Brussels ENV TZ=Europe/Brussels

View File

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

View File

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

View File

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

View File

@ -2,7 +2,7 @@ use crate::commands::{EmbedField, HumanNaiveDate};
use crate::db::users::User; use crate::db::users::User;
use crate::{Context, Error}; use crate::{Context, Error};
use affluences_api::{Reservation, Resource}; use affluences_api::{Reservation, Resource, ResourceState};
use chrono::{NaiveDate, NaiveTime}; use chrono::{NaiveDate, NaiveTime};
use uuid::{uuid, Uuid}; use uuid::{uuid, Uuid};
@ -109,7 +109,7 @@ pub async fn book(
let chosen_resource = resources let chosen_resource = resources
.iter() .iter()
.filter(|r| capacity.is_none() || capacity.unwrap() <= r.capacity) .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 { if let Some(chosen_resource) = chosen_resource {
let reservation = Reservation { let reservation = Reservation {