Skip to content
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.

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

6838 add prefs repo layer #6885

Merged
merged 9 commits into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
6 changes: 1 addition & 5 deletions server/repository/src/db_diesel/preference.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ use super::{
#[derive(PartialEq, Debug, Clone, Default)]
pub struct Preference {
pub preference_row: PreferenceRow,
pub store_row: StoreRow,
}

#[derive(Clone, Default)]
Expand Down Expand Up @@ -77,10 +76,7 @@ impl<'a> PreferenceRepository<'a> {
let result = final_query
.load::<PreferenceJoin>(self.connection.lock().connection())?
.into_iter()
.map(|(preference_row, store_row)| Preference {
preference_row,
store_row,
})
.map(|(preference_row, _store_row)| Preference { preference_row })
.collect();

Ok(result)
Expand Down
23 changes: 21 additions & 2 deletions server/repository/src/db_diesel/preference_row.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,29 @@ impl<'a> PreferenceRowRepository<'a> {
Ok(result)
}

pub fn delete(&self, preference_id: &str) -> Result<(), RepositoryError> {
pub fn find_one_by_id(
&self,
preference_id: &str,
) -> Result<Option<PreferenceRow>, RepositoryError> {
let result = preference::table
.filter(preference::id.eq(preference_id))
.first(self.connection.lock().connection())
.optional()?;
Ok(result)
}

pub fn delete(&self, preference_id: &str) -> Result<Option<i64>, RepositoryError> {
let old_row = self.find_one_by_id(preference_id)?;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey look it came in use! I knew it'd have something to do with sync πŸ˜†

let change_log_id = match old_row {
Some(old_row) => self.insert_changelog(old_row, RowActionType::Delete)?,
None => {
return Ok(None);
}
};

diesel::delete(preference.filter(preference::id.eq(preference_id)))
.execute(self.connection.lock().connection())?;
Ok(())
Ok(Some(change_log_id))
}
}

Expand Down
Loading