fix: resolve merge conflict

Signed-off-by: Eun-chan Cho <eunchan.cho@talabat.com>

Author: echo724

Makefile

@@ -8,7 +8,7 @@ tp = duva.tp
 cli:
 	@echo '🚀 Starting client in local_test/cli...'
 	@mkdir -p local_test/cli
-	@cd local_test/cli && cargo run --bin duva-cli -- --port $(p)
+	@cd local_test/cli && cargo run --bin cli -- --port $(p)
 
 leader:
 	@echo '🔧 Setting up replication with leader on port $(p) and follower on port $(rp)...'

duva-cli/src/command.rs

@@ -81,6 +81,14 @@ pub fn take_input(action: &str, args: &[&str]) -> Result<ClientInputKind, String
             }
             Err("(error) ERR unknown subcommand".to_string())
         },
+        "REPLICAOF" => {
+            if args.len() != 3 {
+                return Err(
+                    "(error) ERR wrong number of arguments for 'replicaof' command".to_string()
+                );
+            };
+            Ok(ClientInputKind::ReplicaOf)
+        },
 
         // Add other commands as needed
         unknown_cmd => {
@@ -104,4 +112,5 @@ pub enum ClientInputKind {
     ClusterNodes,
     ClusterForget,
     Exists,
+    ReplicaOf,
 }

duva-client/src/command.rs

@@ -180,7 +180,7 @@ impl<T> ClientController<T> {
         use ClientInputKind::*;
         match input {
             Ping | Get | IndexGet | Echo | Config | Keys | Save | Info | ClusterForget
-            | ClusterInfo => match query_io {
+            | ReplicaOf | ClusterInfo => match query_io {
                 QueryIO::Null => println!("(nil)"),
                 QueryIO::SimpleString(value) => println!("{value}"),
                 QueryIO::BulkString(value) => println!("{value}"),

duva-client/src/controller.rs

@@ -1,9 +1,9 @@
 use anyhow::Context;
 use chrono::{DateTime, Utc};
 
-use crate::domains::cluster_actors::session::SessionRequest;
-
 use super::request::{ClientAction, ClientRequest};
+use crate::domains::cluster_actors::session::SessionRequest;
+use crate::prelude::PeerIdentifier;
 
 /// Analyze the command and arguments to create a `ClientRequest`
 pub fn parse_query(
@@ -49,7 +49,9 @@ pub fn parse_query(
             "forget" => ClientAction::ClusterForget(val.get(1).cloned().context("Must")?.into()),
             _ => return Err(anyhow::anyhow!("Invalid command")),
         },
-
+        ("replicaof", [host, port]) => {
+            ClientAction::ReplicaOf(PeerIdentifier::new(host, port.parse()?))
+        },
         _ => return Err(anyhow::anyhow!("Invalid command")),
     };
 

duva/src/presentation/clients/parser.rs

@@ -1,5 +1,3 @@
-use super::request::{ClientAction, ClientRequest};
-use crate::domains::peers::identifier::PeerIdentifier;
 use super::{parser::parse_query, request::ClientRequest};
 use crate::{
     TSerdeReadWrite,

duva/src/presentation/clients/stream.rs

@@ -4,3 +4,5 @@ mod test_cluster_known_nodes_increase_when_new_replica_is_added;
 mod test_disseminate_peers;
 mod test_heartbeat;
 mod test_removes_node_when_heartbeat_is_not_received_for_certain_time;
+
+mod test_lazy_discovery;

duva/tests/cluster_ops/mod.rs

@@ -1,10 +1,6 @@
 use crate::common::{ServerEnv, array, check_internodes_communication, spawn_server_process};
 
 use duva::{clients::ClientStreamHandler, domains::query_parsers::query_io::QueryIO};
-mod common;
-use crate::common::bulk_string;
-use common::{ServerEnv, array, check_internodes_communication, spawn_server_process};
-use duva::clients::ClientStreamHandler;
 
 #[tokio::test]
 async fn test_cluster_forget_makes_all_nodes_forget_target_node() {

duva/tests/cluster_ops/test_cluster_forget_makes_all_nodes_forget_target_node.rs

@@ -1,7 +1,3 @@
-mod common;
-use crate::common::bulk_string;
-use common::{ServerEnv, array, spawn_server_process};
-use duva::clients::ClientStreamHandler;
 use crate::common::{ServerEnv, array, spawn_server_process};
 use duva::{clients::ClientStreamHandler, domains::query_parsers::query_io::QueryIO};
 

duva/tests/cluster_ops/test_cluster_known_nodes_increase_when_new_replica_is_added.rs

@@ -1,8 +1,6 @@
-use crate::common::{array, bulk_string, contains_only};
-use common::{ServerEnv, spawn_server_process};
+use crate::common::{ServerEnv, array, contains_only, spawn_server_process};
 use duva::clients::ClientStreamHandler;
-
-mod common;
+use duva::domains::query_parsers::query_io::QueryIO;
 
 #[tokio::test]
 async fn test_lazy_discovery_of_leader() {
@@ -27,7 +25,7 @@ async fn test_lazy_discovery_of_leader() {
     other_h.send_and_get(&array(vec!["SET", "other2", "value2"])).await;
 
     let cluster_info = other_h.send_and_get(&array(vec!["CLUSTER", "INFO"])).await;
-    assert_eq!(cluster_info, bulk_string("cluster_known_nodes:0"));
+    assert_eq!(cluster_info, QueryIO::BulkString("cluster_known_nodes:0".into()).serialize());
 
     assert!(contains_only(
         other_h.send_and_get(&array(vec!["KEYS", "*"])).await,
@@ -44,7 +42,7 @@ async fn test_lazy_discovery_of_leader() {
 
     // THEN
     let cluster_info = other_h.send_and_get(&array(vec!["CLUSTER", "INFO"])).await;
-    assert_eq!(cluster_info, bulk_string("cluster_known_nodes:1"));
+    assert_eq!(cluster_info, QueryIO::BulkString("cluster_known_nodes:1".into()).serialize());
 
     let response = target_h.send_and_get(&array(vec!["KEYS", "*"])).await;
     assert!(contains_only(response, vec!["other", "other2"]));