Skip to content

feat(mono):Introduce service layer and add new comment_reactions ta… #1218

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

Merged
genedna merged 2 commits into from
Jul 12, 2025
Merged

feat(mono):Introduce service layer and add new comment_reactions ta… #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57a336f
feat(mono):Introduce service layer and add new `comment_reactions` ta…
benjamin-747 Jul 11, 2025
c62ae9b
Merge branch 'main' into main
genedna Jul 12, 2025
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
8 changes: 4 additions & 4 deletions aries/src/service/api/nostr_router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ async fn receive(
}
};
//save
let storage = state.storage.services.relay_storage.clone();
let storage = state.storage.relay_storage();
if storage
.get_nostr_event_by_id(&ztm_nostr_event.id)
.await
Expand Down Expand Up @@ -89,7 +89,7 @@ async fn receive(
filters: filters_json.clone(),
id: Uuid::new_v4().to_string(),
};
let storage = state.storage.services.relay_storage.clone();
let storage = state.storage.relay_storage();
let req_list: Vec<Req> = storage
.get_all_nostr_req_by_subscription_id(&subscription_id.to_string())
.await
Expand All @@ -113,7 +113,7 @@ pub async fn event_list(
Query(_query): Query<HashMap<String, String>>,
state: State<AppState>,
) -> Result<Json<Vec<NostrEvent>>, (StatusCode, String)> {
let storage = state.storage.services.relay_storage.clone();
let storage = state.storage.relay_storage();
let event_list: Vec<NostrEvent> = storage
.get_all_nostr_event()
.await
Expand All @@ -128,7 +128,7 @@ pub async fn req_list(
Query(_query): Query<HashMap<String, String>>,
state: State<AppState>,
) -> Result<Json<Vec<Req>>, (StatusCode, String)> {
let storage = state.storage.services.relay_storage.clone();
let storage = state.storage.relay_storage();
let req_list: Vec<Req> = storage
.get_all_nostr_req()
.await
Expand Down
13 changes: 6 additions & 7 deletions ceres/src/api_service/import_api_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl ApiHandler for ImportApiService {
}

async fn get_root_commit(&self) -> Commit {
let storage = self.storage.services.git_db_storage.clone();
let storage = self.storage.git_db_storage();
let refs = storage
.get_default_ref(self.repo.repo_id)
.await
Expand All @@ -62,7 +62,7 @@ impl ApiHandler for ImportApiService {
}

async fn get_root_tree(&self) -> Tree {
let storage = self.storage.services.git_db_storage.clone();
let storage = self.storage.git_db_storage();
let refs = storage
.get_default_ref(self.repo.repo_id)
.await
Expand All @@ -84,8 +84,7 @@ impl ApiHandler for ImportApiService {

async fn get_tree_by_hash(&self, hash: &str) -> Tree {
self.storage
.services
.git_db_storage
.git_db_storage()
.get_tree_by_hash(self.repo.repo_id, hash)
.await
.unwrap()
Expand All @@ -94,7 +93,7 @@ impl ApiHandler for ImportApiService {
}

async fn get_commit_by_hash(&self, hash: &str) -> Option<Commit> {
let storage = self.storage.services.git_db_storage.clone();
let storage = self.storage.git_db_storage();
let commit = storage
.get_commit_by_hash(self.repo.repo_id, hash)
.await
Expand All @@ -103,7 +102,7 @@ impl ApiHandler for ImportApiService {
}

async fn get_tree_relate_commit(&self, t_hash: &str) -> Commit {
let storage = self.storage.services.git_db_storage.clone();
let storage = self.storage.git_db_storage();
let tree_info = storage
.get_tree_by_hash(self.repo.repo_id, t_hash)
.await
Expand All @@ -118,7 +117,7 @@ impl ApiHandler for ImportApiService {
}

async fn get_commits_by_hashes(&self, c_hashes: Vec<String>) -> Result<Vec<Commit>, GitError> {
let storage = self.storage.services.git_db_storage.clone();
let storage = self.storage.git_db_storage();
let commits = storage
.get_commits_by_hashes(self.repo.repo_id, &c_hashes)
.await
Expand Down
6 changes: 1 addition & 5 deletions ceres/src/api_service/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,7 @@ pub trait ApiHandler: Send + Sync {

async fn get_raw_blob_by_hash(&self, hash: &str) -> Result<Option<raw_blob::Model>, MegaError> {
let context = self.get_context();
context
.services
.raw_db_storage
.get_raw_blob_by_hash(hash)
.await
context.raw_db_storage().get_raw_blob_by_hash(hash).await
}

fn strip_relative(&self, path: &Path) -> Result<PathBuf, GitError>;
Expand Down
30 changes: 16 additions & 14 deletions ceres/src/api_service/mono_api_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl ApiHandler for MonoApiService {
///
/// Returns `Ok(())` on success, or a `GitError` on failure.
async fn create_monorepo_file(&self, file_info: CreateFileInfo) -> Result<(), GitError> {
let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();
let path = PathBuf::from(file_info.path);
let mut save_trees = vec![];

Expand Down Expand Up @@ -124,7 +124,7 @@ impl ApiHandler for MonoApiService {
}

async fn get_root_tree(&self) -> Tree {
let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();
let refs = storage.get_ref("/").await.unwrap().unwrap();

storage
Expand All @@ -137,8 +137,7 @@ impl ApiHandler for MonoApiService {

async fn get_tree_by_hash(&self, hash: &str) -> Tree {
self.storage
.services
.mono_storage
.mono_storage()
.get_tree_by_hash(hash)
.await
.unwrap()
Expand All @@ -147,15 +146,14 @@ impl ApiHandler for MonoApiService {
}

async fn get_commit_by_hash(&self, hash: &str) -> Option<Commit> {
let storage = self.storage.services.mono_storage.clone();
match storage.get_commit_by_hash(hash).await {
match self.storage.mono_storage().get_commit_by_hash(hash).await {
Ok(Some(commit)) => Some(commit.into()),
_ => None,
}
}

async fn get_tree_relate_commit(&self, t_hash: &str) -> Commit {
let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();
let tree_info = storage.get_tree_by_hash(t_hash).await.unwrap().unwrap();
storage
.get_commit_by_hash(&tree_info.commit_id)
Expand All @@ -166,8 +164,12 @@ impl ApiHandler for MonoApiService {
}

async fn get_commits_by_hashes(&self, c_hashes: Vec<String>) -> Result<Vec<Commit>, GitError> {
let storage = self.storage.services.mono_storage.clone();
let commits = storage.get_commits_by_hashes(&c_hashes).await.unwrap();
let commits = self
.storage
.mono_storage()
.get_commits_by_hashes(&c_hashes)
.await
.unwrap();
Ok(commits.into_iter().map(|x| x.into()).collect())
}

Expand All @@ -179,7 +181,7 @@ impl ApiHandler for MonoApiService {
Some(tree) => {
let mut item_to_commit = HashMap::new();

let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();
let tree_hashes = tree
.tree_items
.iter()
Expand Down Expand Up @@ -231,7 +233,7 @@ impl ApiHandler for MonoApiService {

impl MonoApiService {
pub async fn merge_mr(&self, username: &str, mr: mega_mr::Model) -> Result<(), MegaError> {
let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();
let refs = storage.get_ref(&mr.path).await.unwrap().unwrap();

if mr.from_hash == refs.ref_commit_hash {
Expand All @@ -258,7 +260,7 @@ impl MonoApiService {
}
// add conversation
self.storage
.issue_storage()
.conversation_storage()
.add_conversation(&mr.link, username, None, ConvTypeEnum::Merged)
.await
.unwrap();
Expand All @@ -280,7 +282,7 @@ impl MonoApiService {
mut tree_vec: Vec<Tree>,
commit: Commit,
) -> Result<String, GitError> {
let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();
let mut save_trees = Vec::new();
let mut p_commit_id = String::new();

Expand Down Expand Up @@ -451,7 +453,7 @@ impl MonoApiService {
commit_hash: &str,
) -> Result<Vec<(PathBuf, SHA1)>, MegaError> {
let mut res = vec![];
let mono_storage = self.storage.services.mono_storage.clone();
let mono_storage = self.storage.mono_storage();
let commit = mono_storage.get_commit_by_hash(commit_hash).await?;
if let Some(commit) = commit {
let tree = mono_storage.get_tree_by_hash(&commit.tree).await?;
Expand Down
29 changes: 12 additions & 17 deletions ceres/src/pack/import_repo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ impl PackHandler for ImportRepo {
async fn head_hash(&self) -> (String, Vec<Refs>) {
let result = self
.storage
.services
.git_db_storage
.git_db_storage()
.get_ref(self.repo.repo_id)
.await
.unwrap();
Expand All @@ -62,7 +61,7 @@ impl PackHandler for ImportRepo {
&self,
mut receiver: UnboundedReceiver<Entry>,
) -> Result<Option<Commit>, GitError> {
let storage = self.storage.services.git_db_storage.clone();
let storage = self.storage.git_db_storage();
let mut entry_list = vec![];
let semaphore = Arc::new(Semaphore::new(8));
let mut join_tasks = vec![];
Expand Down Expand Up @@ -105,8 +104,8 @@ impl PackHandler for ImportRepo {
let (entry_tx, entry_rx) = mpsc::channel(pack_config.channel_message_size);
let (stream_tx, stream_rx) = mpsc::channel(pack_config.channel_message_size);

let storage = self.storage.services.git_db_storage.clone();
let raw_storage = self.storage.services.raw_db_storage.clone();
let storage = self.storage.git_db_storage();
let raw_storage = self.storage.raw_db_storage();
let total = storage.get_obj_count_by_repo_id(self.repo.repo_id).await;
let encoder = PackEncoder::new(total, 0, stream_tx);
encoder.encode_async(entry_rx).await.unwrap();
Expand Down Expand Up @@ -193,7 +192,7 @@ impl PackHandler for ImportRepo {
) -> Result<ReceiverStream<Vec<u8>>, GitError> {
let mut want_clone = want.clone();
let pack_config = &self.storage.config().pack;
let storage = self.storage.services.git_db_storage.clone();
let storage = self.storage.git_db_storage();
let obj_num = AtomicUsize::new(0);

let mut exist_objs = HashSet::new();
Expand Down Expand Up @@ -286,8 +285,7 @@ impl PackHandler for ImportRepo {
async fn get_trees_by_hashes(&self, hashes: Vec<String>) -> Result<Vec<Tree>, MegaError> {
Ok(self
.storage
.services
.git_db_storage
.git_db_storage()
.get_trees_by_hashes(self.repo.repo_id, hashes)
.await
.unwrap()
Expand All @@ -301,14 +299,13 @@ impl PackHandler for ImportRepo {
hashes: Vec<String>,
) -> Result<Vec<raw_blob::Model>, MegaError> {
self.storage
.services
.raw_db_storage
.raw_db_storage()
.get_raw_blobs_by_hashes(hashes)
.await
}

async fn update_refs(&self, _: Option<Commit>, refs: &RefCommand) -> Result<(), GitError> {
let storage = self.storage.services.git_db_storage.clone();
let storage = self.storage.git_db_storage();
match refs.command_type {
CommandType::Create => {
storage
Expand All @@ -332,16 +329,15 @@ impl PackHandler for ImportRepo {

async fn check_commit_exist(&self, hash: &str) -> bool {
self.storage
.services
.git_db_storage
.git_db_storage()
.get_commit_by_hash(self.repo.repo_id, hash)
.await
.unwrap()
.is_some()
}

async fn check_default_branch(&self) -> bool {
let storage = self.storage.services.git_db_storage.clone();
let storage = self.storage.git_db_storage();
storage
.default_branch_exist(self.repo.repo_id)
.await
Expand All @@ -366,14 +362,13 @@ impl ImportRepo {
let mono_api_service = MonoApiService {
storage: self.storage.clone(),
};
let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();
let save_trees = mono_api_service.search_and_create_tree(&path).await?;

let mut root_ref = storage.get_ref("/").await.unwrap().unwrap();
let latest_commit: Commit = self
.storage
.services
.git_db_storage
.git_db_storage()
.get_commit_by_hash(self.repo.repo_id, &commit_id)
.await
.unwrap()
Expand Down
23 changes: 10 additions & 13 deletions ceres/src/pack/monorepo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub struct MonoRepo {
#[async_trait]
impl PackHandler for MonoRepo {
async fn head_hash(&self) -> (String, Vec<Refs>) {
let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();

let result = storage.get_refs(self.path.to_str().unwrap()).await.unwrap();

Expand Down Expand Up @@ -126,7 +126,7 @@ impl PackHandler for MonoRepo {
&self,
mut receiver: UnboundedReceiver<Entry>,
) -> Result<Option<Commit>, GitError> {
let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();
let mut entry_list = Vec::new();
let mut join_tasks = vec![];
let mut current_commit_id = String::new();
Expand Down Expand Up @@ -176,7 +176,7 @@ impl PackHandler for MonoRepo {
) -> Result<ReceiverStream<Vec<u8>>, GitError> {
let mut want_clone = want.clone();
let pack_config = &self.storage.config().pack;
let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();
let obj_num = AtomicUsize::new(0);

let mut exist_objs = HashSet::new();
Expand Down Expand Up @@ -262,8 +262,7 @@ impl PackHandler for MonoRepo {
async fn get_trees_by_hashes(&self, hashes: Vec<String>) -> Result<Vec<Tree>, MegaError> {
Ok(self
.storage
.services
.mono_storage
.mono_storage()
.get_trees_by_hashes(hashes)
.await
.unwrap()
Expand All @@ -277,14 +276,13 @@ impl PackHandler for MonoRepo {
hashes: Vec<String>,
) -> Result<Vec<raw_blob::Model>, MegaError> {
self.storage
.services
.raw_db_storage
.raw_db_storage()
.get_raw_blobs_by_hashes(hashes)
.await
}

async fn update_refs(&self, commit: Option<Commit>, refs: &RefCommand) -> Result<(), GitError> {
let storage = self.storage.services.mono_storage.clone();
let storage = self.storage.mono_storage();

if let Some(c) = commit {
let mr_link = self.handle_mr(&c.format_message()).await.unwrap();
Expand All @@ -311,8 +309,7 @@ impl PackHandler for MonoRepo {

async fn check_commit_exist(&self, hash: &str) -> bool {
self.storage
.services
.mono_storage
.mono_storage()
.get_commit_by_hash(hash)
.await
.unwrap()
Expand Down Expand Up @@ -352,10 +349,10 @@ impl MonoRepo {

async fn handle_existing_mr(&self, mr: mega_mr::Model) -> Result<(), MegaError> {
let mr_stg = self.storage.mr_storage();
let issue_stg = self.storage.issue_storage();
let comment_stg = self.storage.conversation_storage();
if mr.from_hash == self.from_hash {
if mr.to_hash != self.to_hash {
issue_stg
comment_stg
.add_conversation(
&mr.link,
"",
Expand All @@ -372,7 +369,7 @@ impl MonoRepo {
tracing::info!("repeat commit with mr: {}, do nothing", mr.id);
}
} else {
issue_stg
comment_stg
.add_conversation(
&mr.link,
"",
Expand Down
Loading
Loading