fix: register schema works but cred def is broken

Signed-off-by: blu3beri <[email protected]>
animo · Mar 10, 2023 · 3b80638 · 3b80638
1 parent 524b538
commit 3b80638
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/crates/agent/src/modules/schema.rs b/crates/agent/src/modules/schema.rs
@@ -3,7 +3,7 @@ use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 
 /// Schema response from the ledger
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, Default)]
 pub struct Schema {
     /// Version of the schema
     pub ver: String,

diff --git a/crates/automations/src/automations/create_credential_definition.rs b/crates/automations/src/automations/create_credential_definition.rs
@@ -1,10 +1,12 @@
 use siera_agent::modules::credential_definition::CredentialDefinitionCreateOptions;
 use siera_agent::modules::credential_definition::CredentialDefinitionCreateResponse;
 use siera_agent::modules::credential_definition::CredentialDefinitionModule;
+use siera_agent::modules::schema::Schema;
 use siera_agent::modules::schema::{SchemaCreateOptions, SchemaModule};
 
 use colored::Colorize;
 
+use crate::error::Error;
 use crate::error::Result;
 
 /// Automation for creating a credential definition
@@ -32,7 +34,7 @@ impl<'a> CreateCredentialDefinition<'a> {
         &self,
         agent: &(impl SchemaModule + CredentialDefinitionModule + Send + Sync),
     ) -> Result<CredentialDefinitionCreateResponse> {
-        let schema = SchemaModule::create(
+        let s = SchemaModule::create(
             agent,
             SchemaCreateOptions {
                 name: self.name.to_owned(),
@@ -44,10 +46,27 @@ impl<'a> CreateCredentialDefinition<'a> {
                     .collect(),
             },
         )
-        .await?;
+        .await;
+
+        let schema_id = match s {
+            Ok(s) => Ok(s.id),
+            Err(_ )=> {
+                let schemas = SchemaModule::get_all(agent).await?;
+                let mut schema_id: Option<String> = None;
+
+                for sid in schemas.schema_ids {
+                    let schema = SchemaModule::get_by_id(agent, sid).await?;
+                    if schema.name == self.name && schema.version == self.version {
+                        schema_id = Some(schema.id);
+                        break
+                    }
+                }
+                schema_id.ok_or(Error::ConnectionNotReady)
+            }
+        }?;
 
         let options = CredentialDefinitionCreateOptions {
-            schema_id: schema.id,
+            schema_id,
             ..CredentialDefinitionCreateOptions::default()
         };