Merge pull request #23 from kindredgroup/fix/revert-changes

fix: revert changes

Author: hamisor

.github/workflows/ghcr_publish.yml

@@ -6,7 +6,7 @@ name: GHCR Publish
 on:
   push:
     tags:
-        - 'v[0-9]+.[0-9]+.[0-9]+(-(dev|alpha|beta|rc)[0-9]*)?'
+        - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
     build:

.github/workflows/npm_publish.yml

@@ -2,7 +2,7 @@ name: CI
 on:
   push:
       tags:
-          - 'v[0-9]+.[0-9]+.[0-9]+(-(dev|alpha|beta|rc)[0-9]*)?'
+          - 'v[0-9]+.[0-9]+.[0-9]+'
 env:
   DEBUG: napi:*
   APP_NAME: scylla_pg_js

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "scylla_models"
-version = "0.1.34-dev1"
+version = "0.1.33"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

scylla_models/Cargo.toml

@@ -12,7 +12,7 @@ pub struct AddTaskModel {
     pub queue: String,
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug)]
 pub struct UpdateTaskModel {
     pub rn: String,
     pub operation: UpdateOperation,
@@ -21,7 +21,6 @@ pub struct UpdateTaskModel {
     pub worker: Option<String>,
     pub progress: Option<f32>,
     pub task_timeout_in_secs: Option<i64>,
-    pub metrics: Option<Value>,
 }
 
 #[derive(Debug)]
@@ -42,12 +41,11 @@ impl Default for GetTaskModel {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq, Default)]
+#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub enum UpdateOperation {
     Yield,
     HeartBeat,
-    #[default]
     Status,
     Lease,
     Reset,
@@ -131,7 +129,6 @@ pub struct Task {
     pub owner: Option<String>,
     pub errors: Vec<TaskError>,
     pub history: Vec<TaskHistory>,
-    pub metrics: Option<Value>,
 }
 impl Default for Task {
     fn default() -> Self {
@@ -148,7 +145,6 @@ impl Default for Task {
             owner: None,
             errors: Vec::default(),
             history: Vec::default(),
-            metrics: None,
         }
     }
 }
@@ -181,11 +177,10 @@ mod tests {
             status: None,
             worker: None,
             task_timeout_in_secs: None,
-            metrics: None,
         };
         assert_eq!(
             format!("{:?}", utm),
-            "UpdateTaskModel { rn: \"1.2.3\", operation: HeartBeat, status: None, error: None, worker: None, progress: None, task_timeout_in_secs: None, metrics: None }"
+            "UpdateTaskModel { rn: \"1.2.3\", operation: HeartBeat, status: None, error: None, worker: None, progress: None, task_timeout_in_secs: None }"
         );
     }
     #[test]
@@ -273,7 +268,7 @@ mod tests {
             ..Task::default()
         };
         // debug trait
-        assert_eq!(format!("{:?}", t), format!("Task {{ rn: \"\", spec: Null, status: Ready, queue: \"\", progress: 0.0, priority: 0, created: {0:?}, updated: {0:?}, deadline: None, owner: None, errors: [], history: [], metrics: None }}", t_now));
+        assert_eq!(format!("{:?}", t), format!("Task {{ rn: \"\", spec: Null, status: Ready, queue: \"\", progress: 0.0, priority: 0, created: {0:?}, updated: {0:?}, deadline: None, owner: None, errors: [], history: [] }}", t_now));
         // default()
         let t = Task {
             created: t_now,
@@ -295,7 +290,6 @@ mod tests {
                 owner: None,
                 errors: Vec::default(),
                 history: Vec::default(),
-                metrics: None,
             }
         )
     }

scylla_models/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "scylla_operations"
-version = "0.1.34-dev1"
+version = "0.1.33"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

scylla_operations/Cargo.toml

@@ -31,7 +31,9 @@ fn update_task_calls_get_and_update() {
         operation: UpdateOperation::Lease,
         status: Some(TaskStatus::Running),
         worker: Some("worker1".to_string()),
-        ..UpdateTaskModel::default()
+        error: None,
+        progress: None,
+        task_timeout_in_secs: None,
     };
     let task_to_update = Task {
         rn: "unique_id".to_string(),
@@ -56,7 +58,10 @@ fn update_task_returns_scylla_op_error() {
         rn: "unique_id".to_string(),
         operation: UpdateOperation::Status,
         status: Some(TaskStatus::Completed),
-        ..UpdateTaskModel::default()
+        worker: None,
+        error: None,
+        progress: None,
+        task_timeout_in_secs: None,
     };
 
     assert_eq!(

scylla_operations/src/task/tests.rs

@@ -34,9 +34,6 @@ pub fn validate_status_operation(task: &Task, update_task_model: &UpdateTaskMode
 fn prepare_status_task(mut task: Task, update_task_model: &UpdateTaskModel) -> Task {
     task.status = update_task_model.status.clone().unwrap();
     task.updated = Utc::now();
-    if let Some(metrics) = &update_task_model.metrics {
-        task.metrics = Some(metrics.clone());
-    }
     if let Some(error) = update_task_model.error.clone() {
         if task.status == TaskStatus::Aborted {
             task.errors.push(error);