Skip to content

Refactor backwards function to return Option<ObjectS> #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soniapi wants to merge 1 commit into
base: lib
Choose a base branch
from
Open

Refactor backwards function to return Option<ObjectS> #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,17 @@ pub fn backwards(
connection: &mut PgConnection,
start_object_id: i32,
target_type: &String,
) -> Result<Vec<ObjectS>, diesel::result::Error> {
let result_vector = objects_s
) -> Result<Option<ObjectS>, diesel::result::Error> {
let result_option = objects_s
.filter(id.le(start_object_id))
.order(id.desc())
.limit(100)
.select(ObjectS::as_select())
.load::<ObjectS>(connection)?
.into_iter()
.find(|backward_item| backward_item.t == *target_type)
.into_iter()
.collect();
.find(|backward_item| backward_item.t == *target_type);

Ok(result_vector)
Ok(result_option)
}

pub fn calculate_mp(ap: f32, bp: f32) -> f32 {
Expand Down Expand Up @@ -319,19 +317,14 @@ pub fn find_nearest(
) -> Option<f32> {
let mut p_val = None;
match backwards(connection, start_object_id, target_type) {
Ok(items) => {
if let Some(item) = items
.into_iter()
.filter(|i| i.t == *target_type)
.max_by_key(|i| i.d)
{
println!(
"Found object: id={:?}, type={:?}, date={:?}",
item.id, item.t, item.d
);
p_val = Some(item.p);
}
Ok(Some(item)) => {
println!(
"Found object: id={:?}, type={:?}, date={:?}",
item.id, item.t, item.d
);
p_val = Some(item.p);
}
Ok(None) => {}
Err(e) => {
eprintln!("Error fetching objects: {}", e);
}
Expand Down
Loading