Skip to content

fix: Fix the RecordNotInsert error caused by ON CONFLICT DO NOTHING in cla_storage. #2022

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
231220075 wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −19
Open

fix: Fix the RecordNotInsert error caused by ON CONFLICT DO NOTHING in cla_storage. #2022

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
60 changes: 41 additions & 19 deletions jupiter/src/storage/cla_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use std::ops::Deref;
use callisto::cla_sign_status;
use common::errors::MegaError;
use sea_orm::{
ColumnTrait, EntityTrait, QueryFilter, QuerySelect, Set, prelude::Expr, sea_query::OnConflict,
ColumnTrait, DbErr, EntityTrait, QueryFilter, QuerySelect, Set, prelude::Expr,
sea_query::OnConflict,
};

use crate::storage::base_storage::{BaseStorage, StorageConnector};
Expand All @@ -22,6 +23,13 @@ impl Deref for ClaStorage {
}

impl ClaStorage {
fn handle_record_not_inserted<T>(result: Result<T, DbErr>) -> Result<(), MegaError> {
match result {
Ok(_) | Err(DbErr::RecordNotInserted) => Ok(()),
Err(e) => Err(e.into()),
}
}

pub async fn get_status(
&self,
username: &str,
Expand All @@ -44,14 +52,16 @@ impl ClaStorage {
updated_at: Set(now),
};

cla_sign_status::Entity::insert(model)
.on_conflict(
OnConflict::column(cla_sign_status::Column::Username)
.do_nothing()
.to_owned(),
)
.exec(self.get_connection())
.await?;
Self::handle_record_not_inserted(
cla_sign_status::Entity::insert(model)
.on_conflict(
OnConflict::column(cla_sign_status::Column::Username)
.do_nothing()
.to_owned(),
)
.exec(self.get_connection())
.await,
)?;

self.get_status(username)
.await?
Expand All @@ -77,14 +87,16 @@ impl ClaStorage {
updated_at: Set(now),
};

cla_sign_status::Entity::insert(active_model)
.on_conflict(
OnConflict::column(cla_sign_status::Column::Username)
.do_nothing()
.to_owned(),
)
.exec(self.get_connection())
.await?;
Self::handle_record_not_inserted(
cla_sign_status::Entity::insert(active_model)
.on_conflict(
OnConflict::column(cla_sign_status::Column::Username)
.do_nothing()
.to_owned(),
)
.exec(self.get_connection())
.await,
)?;

cla_sign_status::Entity::update_many()
.col_expr(cla_sign_status::Column::ClaSigned, Expr::value(true))
Expand All @@ -95,9 +107,19 @@ impl ClaStorage {
.exec(self.get_connection())
.await?;

self.get_status(username)
let model = self
.get_status(username)
.await?
.ok_or_else(|| MegaError::Other("Failed to sign CLA status".to_string()))
.ok_or_else(|| MegaError::Other("Failed to sign CLA status".to_string()))?;

if !model.cla_signed {
return Err(MegaError::Other(format!(
"CLA status for user `{username}` still unsigned after sign operation (cla_signed={}) ",
model.cla_signed
)));
}

Ok(model)
}

pub async fn unsigned_users(&self, usernames: &[String]) -> Result<Vec<String>, MegaError> {
Expand Down
Loading