refactor: inject job_id (#99)

GaloyMoney · Jun 11, 2024 · db7f29c · db7f29c
1 parent 50b1f7f
commit db7f29c
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 13 deletions.
diff --git a/bats/examples.bats b/bats/examples.bats
@@ -23,10 +23,13 @@ wait_for_new_import_job() {
   exec_graphql 'list-accounts'
   accounts_before=$(graphql_output '.data.accounts.nodes | length')
 
+  job_id=$(random_uuid)
   variables=$(
     jq -n \
+      --arg jobId "$job_id" \
     '{
       input: {
+        jobId: $jobId,
         name: "rust-example",
         endpoint: "http://localhost:2253"
       }

diff --git a/cala-server/migrations/20231211151809_cala_server_setup.sql b/cala-server/migrations/20231211151809_cala_server_setup.sql
@@ -1,8 +1,9 @@
 CREATE TABLE jobs (
   id UUID NOT NULL UNIQUE,
-  name VARCHAR NOT NULL UNIQUE,
+  name VARCHAR NOT NULL,
   created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );
+CREATE INDEX idx_jobs_name ON jobs (name);
 
 CREATE TABLE job_events (
   id UUID REFERENCES jobs(id) NOT NULL,

diff --git a/cala-server/schema.graphql b/cala-server/schema.graphql
@@ -122,6 +122,7 @@ type BalanceAmount {
 
 
 input CalaOutboxImportJobCreateInput {
+	jobId: UUID!
 	name: String!
 	description: String
 	endpoint: String!

diff --git a/cala-server/src/extension/cala_outbox_import/mutation.rs b/cala-server/src/extension/cala_outbox_import/mutation.rs
@@ -3,11 +3,12 @@ use async_graphql::*;
 use super::job::*;
 use crate::{
     app::CalaApp,
-    graphql::{DbOp, Job},
+    graphql::{primitives::UUID, DbOp, Job},
 };
 
 #[derive(InputObject)]
 pub struct CalaOutboxImportJobCreateInput {
+    pub job_id: UUID,
     pub name: String,
     pub description: Option<String>,
     pub endpoint: String,
@@ -37,6 +38,7 @@ impl Mutation {
             .jobs()
             .create_and_spawn_in_op::<CalaOutboxImportJobInitializer, _>(
                 &mut op,
+                input.job_id,
                 input.name.clone(),
                 input.description.clone(),
                 CalaOutboxImportConfig::from(input),

diff --git a/cala-server/src/graphql/primitives.rs b/cala-server/src/graphql/primitives.rs
@@ -68,7 +68,7 @@ pub enum ParamDataType {
     Json,
 }
 
-#[derive(Clone, Copy, Serialize, Deserialize)]
+#[derive(Clone, Debug, Copy, Serialize, Deserialize)]
 #[serde(transparent)]
 pub struct UUID(uuid::Uuid);
 scalar!(UUID);
@@ -103,15 +103,21 @@ impl From<UUID> for cala_ledger::TxTemplateId {
     }
 }
 
-impl From<UUID> for crate::integration::IntegrationId {
+impl From<UUID> for cala_ledger::TransactionId {
     fn from(uuid: UUID) -> Self {
-        crate::integration::IntegrationId::from(uuid.0)
+        cala_ledger::TransactionId::from(uuid.0)
     }
 }
 
-impl From<UUID> for cala_ledger::TransactionId {
+impl From<UUID> for crate::primitives::JobId {
     fn from(uuid: UUID) -> Self {
-        cala_ledger::TransactionId::from(uuid.0)
+        crate::primitives::JobId::from(uuid.0)
+    }
+}
+
+impl From<UUID> for crate::integration::IntegrationId {
+    fn from(uuid: UUID) -> Self {
+        crate::integration::IntegrationId::from(uuid.0)
     }
 }
 

diff --git a/cala-server/src/integration/mod.rs b/cala-server/src/integration/mod.rs
@@ -35,11 +35,11 @@ impl Integrations {
     pub async fn create_in_op(
         &self,
         op: &mut AtomicOperation<'_>,
-        id: IntegrationId,
+        id: impl Into<IntegrationId> + std::fmt::Debug,
         name: String,
         data: impl serde::Serialize,
     ) -> Result<Integration, sqlx::Error> {
-        let integration = Integration::new(id, name, data);
+        let integration = Integration::new(id.into(), name, data);
         sqlx::query!(
             r#"INSERT INTO integrations (id, name, data)
             VALUES ($1, $2, $3)"#,

diff --git a/cala-server/src/job/entity.rs b/cala-server/src/job/entity.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 
 use super::error::JobError;
-use crate::primitives::JobId;
+pub use crate::primitives::JobId;
 
 #[derive(Clone, Eq, Hash, PartialEq, Debug, Serialize, Deserialize, sqlx::Type)]
 #[sqlx(transparent)]
@@ -111,9 +111,7 @@ pub struct NewJob {
 
 impl NewJob {
     pub fn builder() -> NewJobBuilder {
-        let mut builder = NewJobBuilder::default();
-        builder.id(JobId::new());
-        builder
+        NewJobBuilder::default()
     }
 
     pub(super) fn initial_events(self) -> EntityEvents<JobEvent> {

diff --git a/cala-server/src/job/mod.rs b/cala-server/src/job/mod.rs
@@ -47,11 +47,13 @@ impl Jobs {
     pub async fn create_and_spawn_in_op<I: JobInitializer + Default, D: serde::Serialize>(
         &self,
         op: &mut AtomicOperation<'_>,
+        id: impl Into<JobId> + std::fmt::Debug,
         name: String,
         description: Option<String>,
         data: D,
     ) -> Result<Job, JobError> {
         let new_job = NewJob::builder()
+            .id(id)
             .name(name)
             .description(description)
             .data(data)?