From 9313be4be73a70270fb54eab62223a518fe5e53b Mon Sep 17 00:00:00 2001
From: carlosthe19916 <2582866+carlosthe19916@users.noreply.github.com>
Date: Sat, 24 Feb 2024 12:42:44 +0100
Subject: [PATCH] refactor rules
---
Cargo.lock | 2 +-
openubl/api/Cargo.toml | 1 +
openubl/api/src/system/project.rs | 52 +++++++
openubl/api/src/system/ubl_document.rs | 30 ++--
openubl/cli/src/main.rs | 6 +-
openubl/cli/src/sender.rs | 11 ++
openubl/entity/Cargo.toml | 3 +-
openubl/entity/src/credentials.rs | 18 ++-
openubl/entity/src/lib.rs | 1 +
openubl/entity/src/mod.rs | 1 +
openubl/entity/src/prelude.rs | 1 +
openubl/entity/src/project.rs | 12 +-
openubl/entity/src/send_rule.rs | 47 ++++++
openubl/entity/src/ubl_document.rs | 4 +-
openubl/migration/src/lib.rs | 2 +
.../m20240114_154538_create_credentials.rs | 2 +-
.../src/m20240117_142858_create_send_rule.rs | 63 ++++++++
openubl/server/src/dto.rs | 105 +++++++++++++
openubl/server/src/lib.rs | 5 +-
openubl/server/src/server/files.rs | 3 +-
openubl/server/src/server/project.rs | 115 ++++++++++++--
openubl/storage/src/lib.rs | 142 ++++++++++++------
openubl/ui/package.json | 2 +-
xsender/src/file_sender.rs | 18 ++-
xsender/src/zip_manager.rs | 28 ++--
25 files changed, 557 insertions(+), 117 deletions(-)
create mode 100644 openubl/cli/src/sender.rs
create mode 100644 openubl/entity/src/send_rule.rs
create mode 100644 openubl/migration/src/m20240117_142858_create_send_rule.rs
create mode 100644 openubl/server/src/dto.rs
diff --git a/Cargo.lock b/Cargo.lock
index 96879f41..f7d08db4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3147,6 +3147,7 @@ dependencies = [
"openubl-common",
"openubl-entity",
"openubl-migration",
+ "openubl-storage",
"sea-orm",
"sea-query",
"serde",
@@ -3177,7 +3178,6 @@ name = "openubl-entity"
version = "0.1.0"
dependencies = [
"sea-orm",
- "serde",
]
[[package]]
diff --git a/openubl/api/Cargo.toml b/openubl/api/Cargo.toml
index 11fc59af..f7ad7861 100644
--- a/openubl/api/Cargo.toml
+++ b/openubl/api/Cargo.toml
@@ -9,6 +9,7 @@ edition = "2021"
openubl-entity = {path = "../entity"}
openubl-common = {path = "../common"}
openubl-migration = {path = "../migration"}
+openubl-storage = { path = "../storage" }
xsender = {path = "../../xsender"}
diff --git a/openubl/api/src/system/project.rs b/openubl/api/src/system/project.rs
index 24464323..fe7d8166 100644
--- a/openubl/api/src/system/project.rs
+++ b/openubl/api/src/system/project.rs
@@ -120,6 +120,22 @@ impl ProjectContext {
}
// Documents
+ pub async fn get_document(
+ &self,
+ id: i32,
+ tx: Transactional<'_>,
+ ) -> Result