Fix structure

README.md

@@ -17,10 +17,14 @@
 - `zim-cache-api` 缓存接口定义（`F[_]`）。
 - `zim-cache-redis4cats` 基于redis4cats实现缓存。 
 - `zim-cache-redis4zio` 基于zio-redis实现缓存。
-- `zim-domain` 所有领域模型和repository接口定义（`F[_]`）。
+- `zim-domain` 所有领域模型定义。
 - `zim-server` Server端的主要实现，包括 zio 依赖管理、基于 akka-http 的 route 实现、基于 tapir 的 API 具体实现。
-- `zim-infra` 配置和基础设施，包括系统基础配置、工具类、领域对象及其 CRUD 实现。
-- `zim-api` tapir API 描述定义和service接口定义（`F[_]`），具体实现由`zim-server`完成。
+- `zim-infra` 配置和基础设施，包括系统基础配置、工具类、部分领域对象及核心CRUD实现。
+- `zim-api` tapir API 描述定义和 service、repository 接口定义（`F[_]`），repository 具体实现在`zim-infra`，service 具体实现在`zim-server`。
+
+### 架构图
+
+![](./zim-1.drawio.png)
 
 ## 环境
 

build.sbt

@@ -86,15 +86,15 @@ lazy val `zim-server` = (project in file("modules/zim-server"))
 //  .settings(assembly / mainClass := Some("org.bitlap.zim.server.ZimServer"))
   .configure(commonConfiguration)
   .enablePlugins(ScalafmtPlugin, HeaderPlugin, JavaServerAppPackaging, DockerPlugin)
-  .dependsOn(`zim-api`, `zim-auth`, `zim-infra`, `zim-cache-redis4cats`, `zim-cache-redis4zio`)
+  .dependsOn(`zim-auth`, `zim-infra`, `zim-cache-redis4cats`, `zim-cache-redis4zio`)
 
 lazy val `zim-infra` = (project in file("modules/zim-infra"))
   .settings(
     libraryDependencies ++= Dependencies.infrastructureDeps
   )
   .configure(commonConfiguration)
   .enablePlugins(ScalafmtPlugin, HeaderPlugin)
-  .dependsOn(`zim-domain`)
+  .dependsOn(`zim-api`)
 
 lazy val `zim-domain` = (project in file("modules/zim-domain"))
   .settings(BuildInfoSettings.value)
@@ -108,7 +108,7 @@ lazy val `zim-cache-api` = (project in file("modules/zim-cache-api"))
   .enablePlugins(ScalafmtPlugin, HeaderPlugin)
 
 lazy val `zim-api` = (project in file("modules/zim-api"))
-  .settings(libraryDependencies ++= Dependencies.tapirApiDeps)
+  .settings(libraryDependencies ++= Dependencies.apiDeps)
   .configure(commonConfiguration)
   .enablePlugins(ScalafmtPlugin, HeaderPlugin)
   .dependsOn(`zim-domain`)

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/repository/AddMessageRepository.scala → modules/zim-api/src/main/scala/org/bitlap/zim/api/repository/AddMessageRepository.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bitlap.zim.domain.repository
+package org.bitlap.zim.api.repository
 
 import org.bitlap.zim.domain.model.AddMessage
 

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/repository/BaseRepository.scala → modules/zim-api/src/main/scala/org/bitlap/zim/api/repository/BaseRepository.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bitlap.zim.domain.repository
+package org.bitlap.zim.api.repository
 
 /** 基础操作类
  *

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/repository/FriendGroupFriendRepository.scala → modules/zim-api/src/main/scala/org/bitlap/zim/api/repository/FriendGroupFriendRepository.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bitlap.zim.domain.repository
+package org.bitlap.zim.api.repository
 
 import org.bitlap.zim.domain.model.AddFriend
 

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/repository/FriendGroupRepository.scala → modules/zim-api/src/main/scala/org/bitlap/zim/api/repository/FriendGroupRepository.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bitlap.zim.domain.repository
+package org.bitlap.zim.api.repository
 
 import org.bitlap.zim.domain.model.FriendGroup
 

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/repository/GroupMemberRepository.scala → modules/zim-api/src/main/scala/org/bitlap/zim/api/repository/GroupMemberRepository.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bitlap.zim.domain.repository
+package org.bitlap.zim.api.repository
 
 import org.bitlap.zim.domain.model.GroupMember
 

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/repository/GroupRepository.scala → modules/zim-api/src/main/scala/org/bitlap/zim/api/repository/GroupRepository.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bitlap.zim.domain.repository
+package org.bitlap.zim.api.repository
 
 import org.bitlap.zim.domain.model.GroupList
 

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/repository/ReceiveRepository.scala → modules/zim-api/src/main/scala/org/bitlap/zim/api/repository/ReceiveRepository.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bitlap.zim.domain.repository
+package org.bitlap.zim.api.repository
 
 import org.bitlap.zim.domain.model.Receive
 

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/repository/UserRepository.scala → modules/zim-api/src/main/scala/org/bitlap/zim/api/repository/UserRepository.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bitlap.zim.domain.repository
+package org.bitlap.zim.api.repository
 
 import org.bitlap.zim.domain.model.User
 

modules/zim-domain/src/main/scala/org/bitlap/zim/domain/repository/package.scala → modules/zim-api/src/main/scala/org/bitlap/zim/api/repository/package.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.bitlap.zim.domain
+package org.bitlap.zim.api
 
 import eu.timepit.refined.api.{ Refined, Validate }
 import scalikejdbc.SQLSyntax

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/InfrastructureConfiguration.scala

@@ -16,7 +16,7 @@
 
 package org.bitlap.zim.infrastructure
 
-import org.bitlap.zim.domain.repository.{
+import org.bitlap.zim.api.repository.{
   AddMessageRepository,
   FriendGroupFriendRepository,
   FriendGroupRepository,

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleAddMessageRepository.scala

@@ -17,7 +17,7 @@
 package org.bitlap.zim.infrastructure.repository
 
 import org.bitlap.zim.domain.model.AddMessage
-import org.bitlap.zim.domain.repository.AddMessageRepository
+import org.bitlap.zim.api.repository.AddMessageRepository
 import scalikejdbc._
 import zio._
 import zio.stream.ZStream

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleBaseRepository.scala

@@ -17,8 +17,8 @@
 package org.bitlap.zim.infrastructure.repository
 
 import org.bitlap.zim.domain.model.BaseModel
-import org.bitlap.zim.domain.repository.BaseRepository
-import org.bitlap.zim.domain.repository.Condition._
+import org.bitlap.zim.api.repository.BaseRepository
+import org.bitlap.zim.api.repository.Condition._
 import scalikejdbc._
 
 abstract class TangibleBaseRepository[T](M: BaseModel[T]) extends BaseRepository[RStream, T] {

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleFriendGroupFriendRepository.scala

@@ -17,7 +17,7 @@
 package org.bitlap.zim.infrastructure.repository
 
 import org.bitlap.zim.domain.model.AddFriend
-import org.bitlap.zim.domain.repository.FriendGroupFriendRepository
+import org.bitlap.zim.api.repository.FriendGroupFriendRepository
 import scalikejdbc._
 import zio.{ stream, Has, ULayer, URLayer, ZLayer }
 import zio.stream.ZStream

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleFriendGroupRepository.scala

@@ -17,7 +17,7 @@
 package org.bitlap.zim.infrastructure.repository
 
 import org.bitlap.zim.domain.model.FriendGroup
-import org.bitlap.zim.domain.repository.FriendGroupRepository
+import org.bitlap.zim.api.repository.FriendGroupRepository
 import scalikejdbc._
 import zio.{ stream, Has, ULayer, URLayer, ZLayer }
 

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleGroupMemberRepository.scala

@@ -17,7 +17,7 @@
 package org.bitlap.zim.infrastructure.repository
 
 import org.bitlap.zim.domain.model.GroupMember
-import org.bitlap.zim.domain.repository.GroupMemberRepository
+import org.bitlap.zim.api.repository.GroupMemberRepository
 import scalikejdbc._
 import zio._
 import zio.stream.ZStream

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleGroupRepository.scala

@@ -17,7 +17,7 @@
 package org.bitlap.zim.infrastructure.repository
 
 import org.bitlap.zim.domain.model.GroupList
-import org.bitlap.zim.domain.repository.GroupRepository
+import org.bitlap.zim.api.repository.GroupRepository
 import scalikejdbc._
 import zio._
 

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleReceiveRepository.scala

@@ -17,7 +17,7 @@
 package org.bitlap.zim.infrastructure.repository
 
 import org.bitlap.zim.domain.model.Receive
-import org.bitlap.zim.domain.repository.ReceiveRepository
+import org.bitlap.zim.api.repository.ReceiveRepository
 import zio._
 import zio.stream.ZStream
 

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/TangibleUserRepository.scala

@@ -18,7 +18,7 @@ package org.bitlap.zim.infrastructure.repository
 
 import org.bitlap.zim.domain.model
 import org.bitlap.zim.domain.model.User
-import org.bitlap.zim.domain.repository.UserRepository
+import org.bitlap.zim.api.repository.UserRepository
 import scalikejdbc._
 import zio._
 

modules/zim-infra/src/main/scala/org/bitlap/zim/infrastructure/repository/package.scala

@@ -17,7 +17,7 @@
 package org.bitlap.zim.infrastructure
 
 import org.bitlap.zim.domain.model._
-import org.bitlap.zim.domain.repository.Condition
+import org.bitlap.zim.api.repository.Condition
 import scalikejdbc.{ SQL, _ }
 import scalikejdbc.streams._
 import sqls.count
@@ -89,8 +89,8 @@ package object repository {
   ) {
 
     import eu.timepit.refined.refineV
-    import org.bitlap.zim.domain.repository.Condition._
-    import org.bitlap.zim.domain.repository.Condition.ConditionValidator._
+    import org.bitlap.zim.api.repository.Condition._
+    import org.bitlap.zim.api.repository.Condition.ConditionValidator._
 
     @inline def like(y: Option[String]): Option[ZCondition] =
       refineV(Condition(self, y.map(sqls.like(sp.column(self), _)).orNull)).toOption

modules/zim-server/src/main/scala/org/bitlap/zim/server/service/UserServiceImpl.scala

@@ -21,7 +21,7 @@ import org.bitlap.zim.domain
 import org.bitlap.zim.domain.ZimError.BusinessException
 import org.bitlap.zim.domain._
 import org.bitlap.zim.domain.model._
-import org.bitlap.zim.domain.repository._
+import org.bitlap.zim.api.repository._
 import org.bitlap.zim.infrastructure.InfrastructureConfiguration
 import org.bitlap.zim.infrastructure.repository.RStream
 import org.bitlap.zim.infrastructure.repository.TangibleAddMessageRepository.ZAddMessageRepository

project/Dependencies.scala

@@ -88,15 +88,15 @@ object Dependencies {
     "dev.zio" %% "zio-redis"               % "0.0.0+381-86c20614-SNAPSHOT" // 实验性质的
   ) ++ domainDeps ++ akkaDeps ++ otherDeps ++ zioDeps ++ tapirDeps
 
-  lazy val tapirApiDeps: Seq[ModuleID] = Seq(
-    "dev.zio" %% "zio"                         % Version.zio,
-    "dev.zio" %% "zio-interop-reactivestreams" % Version.`zio-interop-reactiveStreams`
+  lazy val apiDeps: Seq[ModuleID] = Seq(
+    "dev.zio"    %% "zio"                         % Version.zio,
+    "dev.zio"    %% "zio-interop-reactivestreams" % Version.`zio-interop-reactiveStreams`,
+    "eu.timepit" %% "refined"                     % Version.refined
   ) ++ akkaDeps ++ tapirDeps ++ domainDeps
 
   lazy val domainDeps: Seq[ModuleID] = Seq(
     "org.scalikejdbc"   %% "scalikejdbc"                      % Version.scalikejdbc % Compile,
     "org.scalikejdbc"   %% "scalikejdbc-syntax-support-macro" % Version.scalikejdbc % Compile,
-    "eu.timepit"        %% "refined"                          % Version.refined,
     "dev.zio"           %% "zio-schema-derivation"            % Version.`zio-schema`,
     "com.typesafe.akka" %% "akka-actor-typed"                 % Version.akka,
     "dev.zio"           %% "zio-schema"                       % Version.`zio-schema`,