redstrate/voting-system
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some poll code cleanup

Browse source
This commit is contained in:
Joshua Goins 2025-01-18 14:38:10 -05:00
parent ce6060b0fa
commit 0904f50567
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main.rs
View file

@ -6,7 +6,6 @@ use axum::{
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::net::SocketAddr; use std::net::SocketAddr;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use axum::extract::rejection::JsonRejection;
use axum::http::StatusCode; use axum::http::StatusCode;
use axum::response::{IntoResponse, Response}; use axum::response::{IntoResponse, Response};
@ -111,11 +110,9 @@ impl AppState {
fn get_poll_config_by_id(id: i32) -> Option<PollConfig> { fn get_poll_config_by_id(id: i32) -> Option<PollConfig> {
if let Ok(data) = std::fs::read_to_string("polls.json") { if let Ok(data) = std::fs::read_to_string("polls.json") {
if let Ok(config) = serde_json::from_str::<PollsConfig>(&data) { if let Ok(config) = serde_json::from_str::<PollsConfig>(&data) {
if let Some(current_poll) = config.current_poll { let current_poll: Vec<&PollConfig> = config.polls.iter().filter(|poll| poll.id == id).collect();
let current_poll: Vec<&PollConfig> = config.polls.iter().filter(|poll| poll.id == current_poll).collect(); if !current_poll.is_empty() {
if !current_poll.is_empty() { return Some(<&PollConfig>::clone(current_poll.first().unwrap()).clone());
return Some(<&PollConfig>::clone(current_poll.first().unwrap()).clone());
}
} }
} }
} }
@ -124,11 +121,7 @@ impl AppState {
} }
fn get_poll_votes_by_poll_id(&self, poll_id: i32) -> Option<Poll> { fn get_poll_votes_by_poll_id(&self, poll_id: i32) -> Option<Poll> {
let mut poll_votes = self.poll_votes.lock().unwrap(); let poll_votes = self.poll_votes.lock().unwrap();
let Some(poll_config) = AppState::get_poll_config_by_id(poll_id) else {
return None;
};
for existing_poll in &poll_votes.polls { for existing_poll in &poll_votes.polls {
if existing_poll.id == poll_id { if existing_poll.id == poll_id {