Move dpts-core to dpts and split crates

Cargo.lock

@@ -770,34 +770,60 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
+[[package]]
+name = "dpts"
+version = "0.1.0"
+dependencies = [
+ "dpts-csv",
+ "dpts-entity",
+ "dpts-error",
+ "dpts-migration",
+]
+
 [[package]]
 name = "dpts-cli"
 version = "0.1.0"
 dependencies = [
  "chrono",
  "clap",
- "dpts-core",
+ "dpts",
 ]
 
 [[package]]
-name = "dpts-core"
+name = "dpts-csv"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "csv",
+ "dpts-entity",
+ "dpts-error",
+ "serde",
+]
+
+[[package]]
+name = "dpts-entity"
 version = "0.1.0"
 dependencies = [
- "anyhow",
  "async-graphql",
  "axum",
  "chrono",
- "clap",
- "csv",
  "dotenv",
  "dpts-migration",
  "log",
  "sea-orm",
  "serde",
- "thiserror 2.0.12",
  "tokio",
 ]
 
+[[package]]
+name = "dpts-error"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "thiserror 2.0.12",
+]
+
 [[package]]
 name = "dpts-migration"
 version = "0.1.0"
@@ -812,7 +838,7 @@ version = "0.1.0"
 dependencies = [
  "chrono",
  "clap",
- "dpts-core",
+ "dpts",
 ]
 
 [[package]]

Cargo.toml

@@ -1,12 +1,29 @@
+[package]
+name = "dpts"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+
+[dependencies]
+dpts-csv = { workspace = true }
+dpts-entity = { workspace = true }
+dpts-error = { workspace = true }
+dpts-migration = { workspace = true }
+
 [workspace]
-members = ["dpts-*"]
+members = [".", "dpts-*"]
 
 [workspace.dependencies]
-dpts-core = {path = "dpts-core"}
+dpts = { path = "." }
+dpts-csv = { path = "dpts-csv" }
+dpts-entity = { path = "dpts-entity" }
+dpts-error = { path = "dpts-error" }
 dpts-migration = {path = "dpts-migration"}
 chrono = {version = "0.4", features = ["serde"]}
 clap = "4.5"
 dotenv = "0.15.0"
+serde = "1.0.219"
 
 [workspace.package]
 version = "0.1.0"

dpts-cli/Cargo.toml

@@ -6,6 +6,6 @@ edition.workspace = true
 repository.workspace = true
 
 [dependencies]
-dpts-core = {workspace = true}
+dpts = {workspace = true}
 chrono = {workspace = true}
 clap = {workspace = true, features = ["derive"]}

dpts-cli/src/main.rs

@@ -4,7 +4,7 @@ mod record;
 //use label::LabelArgs;
 use record::{RecordArgs,RecordAddArgs};
 
-use dpts_core::error::Error;
+use dpts::error::Error;
 
 use clap::{Args, CommandFactory,  Parser, Subcommand};
 

dpts-cli/src/record.rs

@@ -1,6 +1,6 @@
 use chrono::prelude::*;
 use clap::{Args, Subcommand};
-use dpts_core::error::Error;
+use dpts::error::Error;
 use std::str::FromStr;
 
 #[derive(Args, Clone, Debug)]

dpts-core/src/data/achievement.rs

@@ -1,10 +0,0 @@
-use super::id::*;
-
-pub struct Achievement<T, U>
-where T: MayId,
-U: MayId, 
-{
-    id: T,
-    lavel: U,
-    count: i8,
-}

dpts-core/src/data/id.rs

@@ -1,55 +0,0 @@
-
-#[derive(Debug)]
-pub struct IdNumber(usize);
-#[derive(Debug)]
-pub struct IdString(String);
-#[derive(Debug)]
-pub struct NoId();
-
-#[derive(Debug, PartialEq)]
-pub enum IdValue {
-    Number(usize),
-    String(String)
-}
-
-pub trait MayId {
-    fn is_id() -> bool;
-    fn get_value(&self) -> Option<IdValue>;
-}
-
-impl MayId for IdNumber {
-    fn is_id() -> bool {
-        true
-    }
-    fn get_value(&self) -> Option<IdValue> {
-        Some(IdValue::Number(self.0))
-    }
-}
-impl MayId for IdString {
-    fn is_id() -> bool {
-        true
-    }
-    fn get_value(&self) -> Option<IdValue> {
-        Some(IdValue::String(self.0.clone()))
-    }
-}
-impl MayId for NoId {
-    fn is_id() -> bool {
-        false
-    }
-    fn get_value(&self) -> Option<IdValue> {
-        None
-    }
-}
-
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn parse_values() {
-        assert_eq!(Some(IdValue::Number(1)), IdNumber(1).get_value());
-        assert_eq!(Some(IdValue::String("Test".to_string())), IdString("Test".to_string()).get_value());
-        assert_eq!(None, NoId().get_value());
-    }
-}

dpts-core/src/data/label.rs

@@ -1,9 +0,0 @@
-#[derive(Debug)]
-pub struct Label {
-    pub name: String,
-    pub description: String,
-}
-
-
-
-

dpts-core/src/data/mod.rs

@@ -1,9 +0,0 @@
-mod id;
-mod label;
-mod record;
-mod achievement;
-
-pub use id::*;
-pub use label::*;
-pub use record::*;
-pub use achievement::*;

dpts-core/src/data/record.rs

@@ -1,9 +0,0 @@
-use chrono::prelude::*;
-use std::collections::HashMap;
-
-#[derive(Clone, Debug)]
-pub struct Record {
-    pub comment: String,
-    pub date: DateTime<Utc>,
-    pub achievements: HashMap<String, i8>,
-}

dpts-core/src/lib.rs

@@ -1,22 +0,0 @@
-pub mod csv;
-pub mod data;
-pub mod entity;
-pub mod error;
-pub use self::data::Label;
-pub use self::data::Record;
-
-pub fn add(left: u64, right: u64) -> u64 {
-    left + right
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
-    }
-    
-}

dpts-csv/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "dpts-csv"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+
+[dependencies]
+dpts-entity = { workspace = true }
+dpts-error = { workspace = true }
+chrono = { workspace = true }
+serde = { workspace = true }
+csv = "1.3.1"

dpts-csv/src/lib.rs

@@ -8,7 +8,7 @@ pub use record::CsvRecord;
 pub use table::CsvTable;
 pub use writer::CsvWriter;
 
-use crate::error::Error;
+use dpts_error::Error;
 
 use chrono::{DateTime, NaiveDateTime};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};

dpts-csv/src/record.rs

@@ -1,7 +1,7 @@
 use chrono::{DateTime, NaiveDateTime};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
- 
-
+use dpts_entity::RecordDetailModel;
+use dpts_error::Error;
 
 #[derive(Debug, Deserialize, PartialEq, Serialize)]
 pub struct CsvRecord{
@@ -11,9 +11,9 @@ pub struct CsvRecord{
     pub count: i32,
 }
 
-impl TryFrom<crate::entity::RecordDetailModel> for CsvRecord{
-    type Error = crate::error::Error;
-    fn try_from(model: crate::entity::RecordDetailModel) -> Result<Self, Self::Error> {
+impl TryFrom<RecordDetailModel> for CsvRecord{
+    type Error = Error;
+    fn try_from(model: RecordDetailModel) -> Result<Self, Self::Error> {
         todo!()
     }
 }

dpts-csv/src/table.rs

@@ -1,4 +1,4 @@
-use crate::error::Error;
+use dpts_error::Error;
 use super::CsvRecord;
 pub struct CsvTable{
     inner: Vec<CsvRecord>

dpts-entity/Cargo.toml

@@ -1,23 +1,19 @@
 [package]
-name = "dpts-core"
+name = "dpts-entity"
 version.workspace = true
-license.workspace = true
 edition.workspace = true
+license.workspace = true
 repository.workspace = true
 
 [dependencies]
 dpts-migration = { workspace = true }
-anyhow = "1.0"
 async-graphql = {version = "7.0", features = ["chrono"]}
 axum = "0.8"
 chrono = {workspace = true}
-clap = {workspace = true}
 dotenv = {workspace = true}
 log = "0.4.27"
 serde = { version = "1.0", features = ["derive"] }
-thiserror = "2.0"
 tokio = "1.44.2"
-csv = "1.3.1"
 
 [dependencies.sea-orm]
 version = "1.1"

dpts-entity/tests/db.rs

@@ -2,7 +2,7 @@ use std::time::Duration;
 use chrono::{offset, FixedOffset, Local, TimeZone};
 use sea_orm::{entity::*, query::*, ConnectOptions, Database};
 use dpts_migration::{Migrator, MigratorTrait};
-use dpts_core::entity::*;
+use dpts_entity::*;
 
 #[tokio::test]
 async fn main() {

dpts-error/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "dpts-error"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+
+[dependencies]
+anyhow = "1.0.98"
+thiserror = "2.0.12"
+clap = { workspace = true }

dpts-error/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

dpts-server/Cargo.toml

@@ -6,6 +6,6 @@ edition.workspace = true
 repository.workspace = true
 
 [dependencies]
-dpts-core = {workspace = true}
+dpts = {workspace = true}
 chrono = {workspace = true}
 clap = {workspace = true, features = ["derive"]}

src/lib.rs

@@ -0,0 +1,4 @@
+pub use dpts_csv as csv;
+pub use dpts_entity as entity;
+pub use dpts_error as error;
+pub use dpts_migration as migration;