diff --git a/README.md b/README.md index cccbb2f9..1613a854 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Config file is required. The config template is provided in [configs](configs) ### Command line arguments -- `config` path, eg: --conf config.yaml +- `config` path, eg: --conf config.toml - `data` path, eg: --data /opt/librarian/data ### Environment variables @@ -37,5 +37,5 @@ Config file is required. The config template is provided in [configs](configs) 1. Install [Go](https://golang.org/) 2. (Optional) Install [Docker](https://docs.docker.com/) and [Docker Compose](https://docs.docker.com/compose/) 3. (Optional) Deploy dependencies with [tests/docker-compose.yml](tests/docker-compose.yml) -4. Create the config file at [configs/config.yaml](configs/config.yaml) with templates. +4. Create the config file at [configs/config.toml](configs/config.toml) with templates. 5. Run `make run` to start the server diff --git a/app/sephirah/Dockerfile b/app/sephirah/Dockerfile deleted file mode 100644 index 42c9c132..00000000 --- a/app/sephirah/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM golang:1.16 AS builder - -COPY . /src -WORKDIR /src - -RUN GOPROXY=https://goproxy.cn make build - -FROM debian:stable-slim - -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ - netbase \ - && rm -rf /var/lib/apt/lists/ \ - && apt-get autoremove -y && apt-get autoclean -y - -COPY --from=builder /src/bin /app - -WORKDIR /app - -EXPOSE 8000 -EXPOSE 9000 -VOLUME /data/conf - -CMD ["./server", "-conf", "/data/conf"] diff --git a/app/sephirah/cmd/sephirah/main.go b/app/sephirah/cmd/sephirah/main.go deleted file mode 100644 index bd8bb884..00000000 --- a/app/sephirah/cmd/sephirah/main.go +++ /dev/null @@ -1,77 +0,0 @@ -package main - -import ( - "os" - - "github.com/tuihub/librarian/internal/conf" - "github.com/tuihub/librarian/internal/lib/libapp" - "github.com/tuihub/librarian/internal/lib/libcron" - "github.com/tuihub/librarian/internal/lib/libmq" - - "github.com/go-kratos/kratos/v2" - "github.com/go-kratos/kratos/v2/registry" - "github.com/go-kratos/kratos/v2/transport/grpc" - "github.com/go-kratos/kratos/v2/transport/http" -) - -// go build -ldflags "-X main.version=x.y.z". -var ( - // name is the name of the compiled software. - name = "sephirah" //nolint:gochecknoglobals //TODO - // version is the version of the compiled software. - version string - - id, _ = os.Hostname() //nolint:gochecknoglobals //TODO - - // date is the build date of the compiled software. - date string //nolint:gochecknoglobals //TODO - - // version is the proto version of the compiled software. - protoVersion string //nolint:gochecknoglobals //TODO -) - -func newApp(gs *grpc.Server, hs *http.Server, mq *libmq.MQ, cron *libcron.Cron, r registry.Registrar) *kratos.App { - return kratos.New( - kratos.ID(id+name), - kratos.Name(name), - kratos.Version(version), - kratos.Metadata(map[string]string{}), - kratos.Server(gs, hs, mq, cron), - kratos.Registrar(r), - ) -} - -func main() { - appSettings, err := libapp.NewAppSettings(id, name, version, protoVersion, date) - if err != nil { - panic(err) - } - - var bc conf.Sephirah - err = appSettings.LoadConfig(&bc) - if err != nil { - panic(err) - } - - app, cleanup, err := wireApp( - bc.GetServer(), - bc.GetDatabase(), - bc.GetS3(), - bc.GetPorter(), - bc.GetAuth(), - bc.GetMq(), - bc.GetCache(), - bc.GetConsul(), - bc.GetSearch(), - appSettings, - ) - if err != nil { - panic(err) - } - defer cleanup() - - // start and wait for stop signal - if err = app.Run(); err != nil { - panic(err) - } -} diff --git a/app/sephirah/cmd/sephirah/wire.go b/app/sephirah/cmd/sephirah/wire.go deleted file mode 100644 index 44cf4548..00000000 --- a/app/sephirah/cmd/sephirah/wire.go +++ /dev/null @@ -1,60 +0,0 @@ -//go:build wireinject - -// The build tag makes sure the stub is not built in the final build. - -package main - -import ( - "github.com/tuihub/librarian/app/sephirah/internal/biz" - "github.com/tuihub/librarian/app/sephirah/internal/client" - "github.com/tuihub/librarian/app/sephirah/internal/data" - "github.com/tuihub/librarian/app/sephirah/internal/service" - "github.com/tuihub/librarian/app/sephirah/internal/supervisor" - globalclient "github.com/tuihub/librarian/internal/client" - "github.com/tuihub/librarian/internal/conf" - "github.com/tuihub/librarian/internal/lib/libapp" - "github.com/tuihub/librarian/internal/lib/libauth" - "github.com/tuihub/librarian/internal/lib/libcache" - "github.com/tuihub/librarian/internal/lib/libcron" - "github.com/tuihub/librarian/internal/lib/libidgenerator" - "github.com/tuihub/librarian/internal/lib/libmq" - "github.com/tuihub/librarian/internal/lib/libobserve" - "github.com/tuihub/librarian/internal/lib/libsearch" - "github.com/tuihub/librarian/internal/server" - - "github.com/go-kratos/kratos/v2" - "github.com/google/wire" -) - -// wireApp init kratos application. -func wireApp( - *conf.SephirahServer, - *conf.Database, - *conf.S3, - *conf.Porter, - *conf.Auth, - *conf.MQ, - *conf.Cache, - *conf.Consul, - *conf.Search, - *libapp.Settings, -) (*kratos.App, func(), error) { - panic(wire.Build( - server.ProviderSet, - globalclient.ProviderSet, - data.ProviderSet, - biz.ProviderSet, - client.ProviderSet, - supervisor.ProviderSet, - service.ProviderSet, - libauth.ProviderSet, - libmq.ProviderSet, - libcron.ProviderSet, - libcache.ProviderSet, - libobserve.ProviderSet, - libapp.ProviderSet, - libidgenerator.ProviderSet, - libsearch.ProviderSet, - newApp, - )) -} diff --git a/app/sephirah/configs/config.yaml b/app/sephirah/configs/config.yaml deleted file mode 100644 index 47bb6ea9..00000000 --- a/app/sephirah/configs/config.yaml +++ /dev/null @@ -1,24 +0,0 @@ -server: - grpc: - addr: 0.0.0.0:10000 - timeout: 1s - grpc_web: - addr: 0.0.0.0:10010 - timeout: 1s -data: - database: - driver: postgres - host: localhost - port: 5432 - dbname: librarian - user: librarian - password: librarian - no_ssl: true -auth: - salt: test - issuer: test - jwt_secret: test -cache: - driver: memory -mq: - driver: memory \ No newline at end of file diff --git a/app/sephirah/internal/biz/biz.go b/app/sephirah/internal/biz/biz.go deleted file mode 100644 index 2fa06761..00000000 --- a/app/sephirah/internal/biz/biz.go +++ /dev/null @@ -1,24 +0,0 @@ -package biz - -import ( - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizangela" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizbinah" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizchesed" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizgebura" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biznetzach" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biztiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizyesod" - - "github.com/google/wire" -) - -// ProviderSet is biz providers. -var ProviderSet = wire.NewSet( - bizangela.ProviderSet, - biztiphereth.ProviderSet, - bizgebura.NewGebura, - bizbinah.ProviderSet, - bizyesod.ProviderSet, - biznetzach.ProviderSet, - bizchesed.ProviderSet, -) diff --git a/app/sephirah/internal/biz/bizangela/angela.go b/app/sephirah/internal/biz/bizangela/angela.go deleted file mode 100644 index 35f8efe0..00000000 --- a/app/sephirah/internal/biz/bizangela/angela.go +++ /dev/null @@ -1,126 +0,0 @@ -package bizangela - -import ( - "context" - - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizgebura" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelangela" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" - "github.com/tuihub/librarian/app/sephirah/internal/supervisor" - "github.com/tuihub/librarian/internal/lib/libidgenerator" - "github.com/tuihub/librarian/internal/lib/libmq" - "github.com/tuihub/librarian/internal/lib/libsearch" - "github.com/tuihub/librarian/internal/model" - "github.com/tuihub/librarian/internal/model/modelfeed" - porter "github.com/tuihub/protos/pkg/librarian/porter/v1" - - "github.com/google/wire" -) - -var ProviderSet = wire.NewSet( - NewAngela, - NewAngelaBase, - NewPullAccountTopic, - NewPullAccountAppInfoRelationTopic, - NewPullAppInfoTopic, - NewAppInfoCache, - NewPullFeedTopic, - NewNotifyRouterTopic, - NewNotifyPushTopic, - NewFeedToNotifyFlowCache, - NewNotifyFlowCache, - NewNotifyTargetCache, - NewFeedItemPostprocessTopic, - NewUpdateAppInfoIndexTopic, -) - -type Angela struct { - AngelaBase - mq *libmq.MQ -} -type AngelaBase struct { - repo AngelaRepo - supv *supervisor.Supervisor - g bizgebura.GeburaRepo - porter porter.LibrarianPorterServiceClient - search libsearch.Search - id *libidgenerator.IDGenerator -} - -type AngelaRepo interface { - UpsertAccount(context.Context, modeltiphereth.Account) error - UpsertAppInfo(context.Context, *modelgebura.AppInfo, *modelgebura.AppInfo) error - UpsertAppInfos(context.Context, []*modelgebura.AppInfo) error - AccountPurchaseAppInfos(context.Context, model.InternalID, []model.InternalID) error - UpsertFeed(context.Context, *modelfeed.Feed) error - CheckNewFeedItems(context.Context, []*modelfeed.Item, model.InternalID) ([]string, error) - UpsertFeedItems(context.Context, []*modelfeed.Item, model.InternalID) error - UpdateFeedPullStatus(context.Context, *modelyesod.FeedConfig) error - GetFeedItem(context.Context, model.InternalID) (*modelfeed.Item, error) - GetFeedActions(context.Context, model.InternalID) ([]*modelyesod.FeedActionSet, error) - GetNotifyTargetItems(context.Context, model.InternalID, model.Paging) (*modelsupervisor.FeatureRequest, []*modelfeed.Item, error) - AddFeedItemsToCollection(context.Context, model.InternalID, []model.InternalID) error -} - -func NewAngelaBase( - repo AngelaRepo, - supv *supervisor.Supervisor, - g bizgebura.GeburaRepo, - pClient porter.LibrarianPorterServiceClient, - search libsearch.Search, - id *libidgenerator.IDGenerator, -) (*AngelaBase, error) { - return &AngelaBase{ - repo: repo, - supv: supv, - g: g, - porter: pClient, - search: search, - id: id, - }, nil -} - -func NewAngela( - base *AngelaBase, - mq *libmq.MQ, - pullAccountInfo *libmq.Topic[modeltiphereth.PullAccountInfo], - pullAccountAppInfoRelation *libmq.Topic[modelangela.PullAccountAppInfoRelation], - pullAppInfo *libmq.Topic[modelangela.PullAppInfo], - pullFeed *libmq.Topic[modelyesod.PullFeed], - notifyRouter *libmq.Topic[modelangela.NotifyRouter], - notifyPush *libmq.Topic[modelangela.NotifyPush], - itemPostprocess *libmq.Topic[modelangela.FeedItemPostprocess], - updateAppIndex *libmq.Topic[modelangela.UpdateAppInfoIndex], -) (*Angela, error) { - if err := mq.RegisterTopic(pullAccountInfo); err != nil { - return nil, err - } - if err := mq.RegisterTopic(pullAccountAppInfoRelation); err != nil { - return nil, err - } - if err := mq.RegisterTopic(pullAppInfo); err != nil { - return nil, err - } - if err := mq.RegisterTopic(pullFeed); err != nil { - return nil, err - } - if err := mq.RegisterTopic(notifyRouter); err != nil { - return nil, err - } - if err := mq.RegisterTopic(notifyPush); err != nil { - return nil, err - } - if err := mq.RegisterTopic(itemPostprocess); err != nil { - return nil, err - } - if err := mq.RegisterTopic(updateAppIndex); err != nil { - return nil, err - } - return &Angela{ - AngelaBase: *base, - mq: mq, - }, nil -} diff --git a/app/sephirah/internal/biz/bizgebura/gebura.go b/app/sephirah/internal/biz/bizgebura/gebura.go deleted file mode 100644 index c75d8d64..00000000 --- a/app/sephirah/internal/biz/bizgebura/gebura.go +++ /dev/null @@ -1,89 +0,0 @@ -package bizgebura - -import ( - "context" - "time" - - "github.com/tuihub/librarian/app/sephirah/internal/model/modelangela" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - "github.com/tuihub/librarian/app/sephirah/internal/supervisor" - "github.com/tuihub/librarian/internal/lib/libauth" - "github.com/tuihub/librarian/internal/lib/libcache" - "github.com/tuihub/librarian/internal/lib/libidgenerator" - "github.com/tuihub/librarian/internal/lib/libmq" - "github.com/tuihub/librarian/internal/lib/libsearch" - "github.com/tuihub/librarian/internal/model" - porter "github.com/tuihub/protos/pkg/librarian/porter/v1" - - "github.com/go-kratos/kratos/v2/errors" -) - -type ReportAppPackageHandler interface { - Handle(context.Context, []*modelgebura.AppBinary) *errors.Error -} - -type GeburaRepo interface { - CreateAppInfo(context.Context, *modelgebura.AppInfo) error - CreateAppInfoOrGet(context.Context, *modelgebura.AppInfo) (*modelgebura.AppInfo, error) - UpdateAppInfo(context.Context, *modelgebura.AppInfo) error - ListAppInfos(context.Context, model.Paging, []string, []modelgebura.AppType, - []model.InternalID, bool) ([]*modelgebura.AppInfo, int64, error) - MergeAppInfos(context.Context, modelgebura.AppInfo, model.InternalID) error - GetAppInfo(context.Context, modelgebura.AppInfoID) (*modelgebura.AppInfo, error) - GetBoundAppInfos(context.Context, model.InternalID) ([]*modelgebura.AppInfo, error) - GetBatchBoundAppInfos(context.Context, []model.InternalID) ([]*modelgebura.BoundAppInfos, error) - PurchaseAppInfo(context.Context, model.InternalID, - *modelgebura.AppInfoID, func(ctx2 context.Context) error) (model.InternalID, error) - GetPurchasedAppInfos(context.Context, model.InternalID, string) ([]*modelgebura.BoundAppInfos, error) - - CreateApp(context.Context, model.InternalID, *modelgebura.App) error - UpdateApp(context.Context, model.InternalID, *modelgebura.App) error - ListApps(context.Context, model.Paging, []model.InternalID, []model.InternalID, - []model.InternalID, bool) ([]*modelgebura.App, int, error) - AssignApp(context.Context, model.InternalID, model.InternalID, model.InternalID) error - // ListAppPackageBinaryChecksumOfOneSource(context.Context, modelgebura.AppPackageSource, - // model.InternalID) ([]string, error) - UnAssignApp(context.Context, model.InternalID, model.InternalID) error - AddAppInstRunTime(context.Context, model.InternalID, model.InternalID, *model.TimeRange) error - SumAppInstRunTime(context.Context, model.InternalID, model.InternalID, *model.TimeRange) (time.Duration, error) - CreateAppInst(context.Context, model.InternalID, *modelgebura.AppInst) error - UpdateAppInst(context.Context, model.InternalID, *modelgebura.AppInst) error - ListAppInsts(context.Context, model.InternalID, model.Paging, []model.InternalID, - []model.InternalID, []model.InternalID) ([]*modelgebura.AppInst, int, error) -} - -type Gebura struct { - auth *libauth.Auth - repo GeburaRepo - id *libidgenerator.IDGenerator - search libsearch.Search - porter porter.LibrarianPorterServiceClient - supv *supervisor.Supervisor - updateAppInfoIndex *libmq.Topic[modelangela.UpdateAppInfoIndex] - pullAppInfo *libmq.Topic[modelangela.PullAppInfo] - appInfoCache *libcache.Map[modelgebura.AppInfoID, modelgebura.AppInfo] -} - -func NewGebura( - repo GeburaRepo, - auth *libauth.Auth, - id *libidgenerator.IDGenerator, - search libsearch.Search, - pClient porter.LibrarianPorterServiceClient, - supv *supervisor.Supervisor, - updateAppIndex *libmq.Topic[modelangela.UpdateAppInfoIndex], - pullAppInfo *libmq.Topic[modelangela.PullAppInfo], - appInfoCache *libcache.Map[modelgebura.AppInfoID, modelgebura.AppInfo], -) *Gebura { - return &Gebura{ - auth: auth, - repo: repo, - id: id, - search: search, - porter: pClient, - supv: supv, - updateAppInfoIndex: updateAppIndex, - pullAppInfo: pullAppInfo, - appInfoCache: appInfoCache, - } -} diff --git a/app/sephirah/internal/data/internal/ent/runtime/runtime.go b/app/sephirah/internal/data/internal/ent/runtime/runtime.go deleted file mode 100644 index e40243f4..00000000 --- a/app/sephirah/internal/data/internal/ent/runtime/runtime.go +++ /dev/null @@ -1,10 +0,0 @@ -// Code generated by ent, DO NOT EDIT. - -package runtime - -// The schema-stitching logic is generated in github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/runtime.go - -const ( - Version = "v0.14.1" // Version of ent codegen. - Sum = "h1:fUERL506Pqr92EPHJqr8EYxbPioflJo6PudkrEA8a/s=" // Sum of ent codegen. -) diff --git a/app/sephirah/pkg/service/service.go b/app/sephirah/pkg/service/service.go deleted file mode 100644 index 03bcaba9..00000000 --- a/app/sephirah/pkg/service/service.go +++ /dev/null @@ -1,6 +0,0 @@ -package service - -import "github.com/google/wire" - -// ProviderSet is data providers. -var ProviderSet = wire.NewSet(NewSephirahService) diff --git a/app/sephirah/pkg/service/wire.go b/app/sephirah/pkg/service/wire.go deleted file mode 100644 index 9926df38..00000000 --- a/app/sephirah/pkg/service/wire.go +++ /dev/null @@ -1,50 +0,0 @@ -//go:build wireinject - -// The build tag makes sure the stub is not built in the final build. - -package service - -import ( - "github.com/tuihub/librarian/app/sephirah/internal/biz" - "github.com/tuihub/librarian/app/sephirah/internal/client" - "github.com/tuihub/librarian/app/sephirah/internal/data" - "github.com/tuihub/librarian/app/sephirah/internal/service" - "github.com/tuihub/librarian/app/sephirah/internal/supervisor" - "github.com/tuihub/librarian/internal/conf" - "github.com/tuihub/librarian/internal/lib/libapp" - "github.com/tuihub/librarian/internal/lib/libauth" - "github.com/tuihub/librarian/internal/lib/libcache" - "github.com/tuihub/librarian/internal/lib/libcron" - "github.com/tuihub/librarian/internal/lib/libidgenerator" - "github.com/tuihub/librarian/internal/lib/libmq" - "github.com/tuihub/librarian/internal/lib/libsearch" - miner "github.com/tuihub/protos/pkg/librarian/miner/v1" - - pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" - - "github.com/google/wire" -) - -func NewSephirahService( - *conf.SephirahServer, - *conf.Database, - *conf.S3, - *conf.Porter, - *conf.Consul, - *libauth.Auth, - *libmq.MQ, - *libcron.Cron, - libcache.Store, - *libapp.Settings, - *libidgenerator.IDGenerator, - libsearch.Search, - miner.LibrarianMinerServiceClient, -) (pb.LibrarianSephirahServiceServer, func(), error) { - panic(wire.Build( - data.ProviderSet, - biz.ProviderSet, - client.ProviderSet, - supervisor.ProviderSet, - service.ProviderSet, - )) -} diff --git a/app/sephirah/pkg/service/wire_gen.go b/app/sephirah/pkg/service/wire_gen.go deleted file mode 100644 index 265774af..00000000 --- a/app/sephirah/pkg/service/wire_gen.go +++ /dev/null @@ -1,122 +0,0 @@ -// Code generated by Wire. DO NOT EDIT. - -//go:generate go run -mod=mod github.com/google/wire/cmd/wire -//go:build !wireinject -// +build !wireinject - -package service - -import ( - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizangela" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizbinah" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizchesed" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizgebura" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biznetzach" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biztiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizyesod" - "github.com/tuihub/librarian/app/sephirah/internal/client" - "github.com/tuihub/librarian/app/sephirah/internal/data" - "github.com/tuihub/librarian/app/sephirah/internal/service" - "github.com/tuihub/librarian/app/sephirah/internal/supervisor" - "github.com/tuihub/librarian/internal/conf" - "github.com/tuihub/librarian/internal/lib/libapp" - "github.com/tuihub/librarian/internal/lib/libauth" - "github.com/tuihub/librarian/internal/lib/libcache" - "github.com/tuihub/librarian/internal/lib/libcron" - "github.com/tuihub/librarian/internal/lib/libidgenerator" - "github.com/tuihub/librarian/internal/lib/libmq" - "github.com/tuihub/librarian/internal/lib/libsearch" - "github.com/tuihub/protos/pkg/librarian/miner/v1" - v1_2 "github.com/tuihub/protos/pkg/librarian/sephirah/v1" -) - -// Injectors from wire.go: - -func NewSephirahService(sephirahServer *conf.SephirahServer, database *conf.Database, s3 *conf.S3, porter *conf.Porter, consul *conf.Consul, auth *libauth.Auth, mq *libmq.MQ, cron *libcron.Cron, store libcache.Store, settings *libapp.Settings, idGenerator *libidgenerator.IDGenerator, search libsearch.Search, librarianMinerServiceClient v1.LibrarianMinerServiceClient) (v1_2.LibrarianSephirahServiceServer, func(), error) { - entClient, cleanup, err := data.NewSQLClient(database, settings) - if err != nil { - return nil, nil, err - } - dataData := data.NewData(entClient) - angelaRepo := data.NewAngelaRepo(dataData) - librarianPorterServiceClient, err := client.NewPorterClient(consul, porter, settings) - if err != nil { - cleanup() - return nil, nil, err - } - clientPorter, err := client.NewPorter(librarianPorterServiceClient, consul, porter) - if err != nil { - cleanup() - return nil, nil, err - } - netzachRepo := data.NewNetzachRepo(dataData) - topic := biznetzach.NewSystemNotificationTopic(netzachRepo, idGenerator) - tipherethRepo := data.NewTipherethRepo(dataData) - libcacheMap := biztiphereth.NewPorterInstanceCache(tipherethRepo, store) - map2 := biztiphereth.NewPorterContextCache(tipherethRepo, store) - supervisorSupervisor, err := supervisor.NewSupervisor(porter, mq, auth, clientPorter, topic, libcacheMap, map2) - if err != nil { - cleanup() - return nil, nil, err - } - geburaRepo := data.NewGeburaRepo(dataData) - angelaBase, err := bizangela.NewAngelaBase(angelaRepo, supervisorSupervisor, geburaRepo, librarianPorterServiceClient, search, idGenerator) - if err != nil { - cleanup() - return nil, nil, err - } - map3 := bizangela.NewAppInfoCache(geburaRepo, store) - libmqTopic := bizangela.NewUpdateAppInfoIndexTopic(angelaBase) - topic2 := bizangela.NewPullAppInfoTopic(angelaBase, map3, libmqTopic) - topic3 := bizangela.NewPullAccountAppInfoRelationTopic(angelaBase, topic2) - topic4 := bizangela.NewPullAccountTopic(angelaBase, topic3) - map4 := bizangela.NewNotifyFlowCache(netzachRepo, store) - map5 := bizangela.NewFeedToNotifyFlowCache(netzachRepo, store) - map6 := bizangela.NewNotifyTargetCache(netzachRepo, store) - topic5 := bizangela.NewNotifyPushTopic(angelaBase, map6) - topic6 := bizangela.NewNotifyRouterTopic(angelaBase, map4, map5, topic5) - topic7 := bizangela.NewFeedItemPostprocessTopic(angelaBase, topic6, topic) - topic8 := bizangela.NewPullFeedTopic(angelaBase, topic7, topic) - angela, err := bizangela.NewAngela(angelaBase, mq, topic4, topic3, topic2, topic8, topic6, topic5, topic7, libmqTopic) - if err != nil { - cleanup() - return nil, nil, err - } - key := biztiphereth.NewUserCountCache(tipherethRepo, store) - tiphereth, err := biztiphereth.NewTiphereth(settings, tipherethRepo, auth, supervisorSupervisor, idGenerator, search, topic4, cron, key, libcacheMap) - if err != nil { - cleanup() - return nil, nil, err - } - gebura := bizgebura.NewGebura(geburaRepo, auth, idGenerator, search, librarianPorterServiceClient, supervisorSupervisor, libmqTopic, topic2, map3) - binahRepo, err := data.NewBinahRepo(s3) - if err != nil { - cleanup() - return nil, nil, err - } - controlBlock := bizbinah.NewControlBlock(auth) - binah := bizbinah.NewBinah(binahRepo, controlBlock, auth) - yesodRepo := data.NewYesodRepo(dataData) - map7 := bizyesod.NewFeedOwnerCache(yesodRepo, store) - yesod, err := bizyesod.NewYesod(yesodRepo, supervisorSupervisor, cron, idGenerator, search, topic8, topic, map7) - if err != nil { - cleanup() - return nil, nil, err - } - netzach, err := biznetzach.NewNetzach(netzachRepo, supervisorSupervisor, idGenerator, search, mq, map5, map4, map6, topic) - if err != nil { - cleanup() - return nil, nil, err - } - chesedRepo := data.NewChesedRepo(dataData) - map8 := bizchesed.NewImageCache(store) - chesed, err := bizchesed.NewChesed(chesedRepo, binahRepo, idGenerator, search, cron, librarianPorterServiceClient, librarianMinerServiceClient, controlBlock, map8) - if err != nil { - cleanup() - return nil, nil, err - } - librarianSephirahServiceServer := service.NewLibrarianSephirahServiceService(angela, tiphereth, gebura, binah, yesod, netzach, chesed, supervisorSupervisor, settings, auth, sephirahServer) - return librarianSephirahServiceServer, func() { - cleanup() - }, nil -} diff --git a/cmd/librarian/wire_gen.go b/cmd/librarian/wire_gen.go deleted file mode 100644 index 59507bf6..00000000 --- a/cmd/librarian/wire_gen.go +++ /dev/null @@ -1,102 +0,0 @@ -// Code generated by Wire. DO NOT EDIT. - -//go:generate go run -mod=mod github.com/google/wire/cmd/wire -//go:build !wireinject -// +build !wireinject - -package main - -import ( - "github.com/go-kratos/kratos/v2" - "github.com/tuihub/librarian/app/miner/pkg/service" - service2 "github.com/tuihub/librarian/app/sephirah/pkg/service" - "github.com/tuihub/librarian/internal/conf" - "github.com/tuihub/librarian/internal/inprocgrpc" - "github.com/tuihub/librarian/internal/lib/libapp" - "github.com/tuihub/librarian/internal/lib/libauth" - "github.com/tuihub/librarian/internal/lib/libcache" - "github.com/tuihub/librarian/internal/lib/libcron" - "github.com/tuihub/librarian/internal/lib/libidgenerator" - "github.com/tuihub/librarian/internal/lib/libmq" - "github.com/tuihub/librarian/internal/lib/libobserve" - "github.com/tuihub/librarian/internal/lib/libsearch" - "github.com/tuihub/librarian/internal/server" -) - -// Injectors from wire.go: - -// wireApp init kratos application. -func wireApp(librarian_EnableServiceDiscovery *conf.Librarian_EnableServiceDiscovery, sephirahServer *conf.SephirahServer, database *conf.Database, s3 *conf.S3, porter *conf.Porter, miner_Data *conf.Miner_Data, auth *conf.Auth, mq *conf.MQ, cache *conf.Cache, consul *conf.Consul, search *conf.Search, settings *libapp.Settings) (*kratos.App, func(), error) { - libauthAuth, err := libauth.NewAuth(auth) - if err != nil { - return nil, nil, err - } - builtInObserver, err := libobserve.NewBuiltInObserver() - if err != nil { - return nil, nil, err - } - libmqMQ, cleanup, err := libmq.NewMQ(mq, database, cache, settings, builtInObserver) - if err != nil { - return nil, nil, err - } - cron, err := libcron.NewCron() - if err != nil { - cleanup() - return nil, nil, err - } - store, err := libcache.NewStore(cache) - if err != nil { - cleanup() - return nil, nil, err - } - idGenerator := libidgenerator.NewIDGenerator() - libsearchSearch, err := libsearch.NewSearch(search, settings) - if err != nil { - cleanup() - return nil, nil, err - } - librarianMinerServiceServer, cleanup2, err := service.NewMinerService(miner_Data, settings) - if err != nil { - cleanup() - return nil, nil, err - } - inprocClients := inprocgrpc.NewInprocClients(librarianMinerServiceServer) - librarianMinerServiceClient, err := minerClientSelector(librarian_EnableServiceDiscovery, consul, inprocClients, settings) - if err != nil { - cleanup2() - cleanup() - return nil, nil, err - } - librarianSephirahServiceServer, cleanup3, err := service2.NewSephirahService(sephirahServer, database, s3, porter, consul, libauthAuth, libmqMQ, cron, store, settings, idGenerator, libsearchSearch, librarianMinerServiceClient) - if err != nil { - cleanup2() - cleanup() - return nil, nil, err - } - grpcServer, err := server.NewGRPCServer(sephirahServer, libauthAuth, librarianSephirahServiceServer, settings, builtInObserver) - if err != nil { - cleanup3() - cleanup2() - cleanup() - return nil, nil, err - } - httpServer, err := server.NewGrpcWebServer(grpcServer, sephirahServer, libauthAuth, settings, builtInObserver) - if err != nil { - cleanup3() - cleanup2() - cleanup() - return nil, nil, err - } - app, err := newApp(grpcServer, httpServer, libmqMQ, cron, builtInObserver, consul) - if err != nil { - cleanup3() - cleanup2() - cleanup() - return nil, nil, err - } - return app, func() { - cleanup3() - cleanup2() - cleanup() - }, nil -} diff --git a/configs/.gitignore b/configs/.gitignore index a5394700..e7bacb48 100644 --- a/configs/.gitignore +++ b/configs/.gitignore @@ -1 +1,2 @@ -config.yaml \ No newline at end of file +config.yaml +config.toml \ No newline at end of file diff --git a/configs/example-for-single-node.toml b/configs/example-for-single-node.toml new file mode 100644 index 00000000..57f2242e --- /dev/null +++ b/configs/example-for-single-node.toml @@ -0,0 +1,39 @@ +[server.grpc] +addr = "0.0.0.0:10000" +timeout = "1s" + +[server.grpc_web] +addr = "0.0.0.0:10001" +timeout = "1s" + +[database] +driver = "postgres" +host = "localhost" +port = 5432 +dbname = "librarian" +user = "librarian" +password = "librarian" +no_ssl = true + +[s3] +end_point = "127.0.0.1:9000" +access_key = "librarian" +secret_key = "librarian" +use_ssl = false + +[auth] +password_salt = "test" +jwt_issuer = "test" +jwt_secret = "test" + +[mq] +driver = "redis" + +[cache] +driver = "redis" +addr = "localhost:6379" + +[searcher.data.meilisearch] +addr = "http://localhost:7700" + +[miner.data] diff --git a/configs/example-for-single-node.yaml b/configs/example-for-single-node.yaml deleted file mode 100644 index 42ea01c4..00000000 --- a/configs/example-for-single-node.yaml +++ /dev/null @@ -1,35 +0,0 @@ -server: - grpc: - addr: 0.0.0.0:10000 - timeout: 1s - grpc_web: - addr: 0.0.0.0:10001 - timeout: 1s -database: - driver: postgres - host: localhost - port: 5432 - dbname: librarian - user: librarian - password: librarian - no_ssl: true -s3: - end_point: 127.0.0.1:9000 - access_key: librarian - secret_key: librarian - use_ssl: false -auth: - password_salt: test - jwt_issuer: test - jwt_secret: test -mq: - driver: redis -cache: - driver: redis - addr: localhost:6379 -searcher: - data: - meilisearch: - addr: "http://localhost:7700" -miner: - data: \ No newline at end of file diff --git a/configs/example-for-testing.toml b/configs/example-for-testing.toml new file mode 100644 index 00000000..fa8adf47 --- /dev/null +++ b/configs/example-for-testing.toml @@ -0,0 +1,28 @@ +[server.grpc] +addr = "0.0.0.0:10000" +timeout = "60s" + +[server.grpc_web] +addr = "0.0.0.0:10001" +timeout = "60s" + +[database] +driver = "memory" + +[s3] + +[auth] +password_salt = "test" +jwt_issuer = "test" +jwt_secret = "test" + +[mq] +driver = "memory" + +[cache] +driver = "memory" + +[searcher.data.bleve] +enable = "" + +[miner.data] diff --git a/configs/example-for-testing.yaml b/configs/example-for-testing.yaml deleted file mode 100644 index 939c51f7..00000000 --- a/configs/example-for-testing.yaml +++ /dev/null @@ -1,24 +0,0 @@ -server: - grpc: - addr: 0.0.0.0:10000 - timeout: 60s - grpc_web: - addr: 0.0.0.0:10001 - timeout: 60s -database: - driver: memory -s3: -auth: - password_salt: test - jwt_issuer: test - jwt_secret: test -mq: - driver: memory -cache: - driver: memory -searcher: - data: - bleve: - enable: -miner: - data: \ No newline at end of file diff --git a/go.mod b/go.mod index 33d2fd41..43e38d94 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,8 @@ require ( github.com/go-kratos/kratos/contrib/log/zap/v2 v2.0.0-20250210091908-15168b5a1b7d github.com/go-kratos/kratos/contrib/registry/consul/v2 v2.0.0-20250210091908-15168b5a1b7d github.com/go-kratos/kratos/v2 v2.8.3 + github.com/gofiber/fiber/v2 v2.52.6 + github.com/gofiber/template/html/v2 v2.1.3 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 @@ -32,6 +34,7 @@ require ( github.com/meilisearch/meilisearch-go v0.31.0 github.com/minio/minio-go/v7 v7.0.87 github.com/redis/go-redis/v9 v9.7.3 + github.com/samber/lo v1.49.1 github.com/sony/sonyflake v1.2.0 github.com/tuihub/protos v0.4.25 go.opentelemetry.io/otel v1.34.0 @@ -108,6 +111,8 @@ require ( github.com/go-openapi/inflect v0.19.0 // indirect github.com/go-playground/form/v4 v4.2.0 // indirect github.com/goccy/go-json v0.10.5 // indirect + github.com/gofiber/template v1.8.3 // indirect + github.com/gofiber/utils v1.1.0 // indirect github.com/golang-jwt/jwt/v4 v4.5.1 // indirect github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect github.com/golang/protobuf v1.5.4 // indirect @@ -135,6 +140,7 @@ require ( github.com/mailru/easyjson v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect github.com/minio/crc64nvme v1.0.1 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect @@ -146,6 +152,7 @@ require ( github.com/oklog/ulid v1.3.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect + github.com/rivo/uniseg v0.2.0 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/rs/cors v1.8.3 // indirect github.com/rs/xid v1.6.0 // indirect @@ -157,6 +164,9 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.1 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.51.0 // indirect + github.com/valyala/tcplisten v1.0.0 // indirect github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect diff --git a/go.sum b/go.sum index e12d8038..cb8461f4 100644 --- a/go.sum +++ b/go.sum @@ -260,6 +260,14 @@ github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/gofiber/fiber/v2 v2.52.6 h1:Rfp+ILPiYSvvVuIPvxrBns+HJp8qGLDnLJawAu27XVI= +github.com/gofiber/fiber/v2 v2.52.6/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw= +github.com/gofiber/template v1.8.3 h1:hzHdvMwMo/T2kouz2pPCA0zGiLCeMnoGsQZBTSYgZxc= +github.com/gofiber/template v1.8.3/go.mod h1:bs/2n0pSNPOkRa5VJ8zTIvedcI/lEYxzV3+YPXdBvq8= +github.com/gofiber/template/html/v2 v2.1.3 h1:n1LYBtmr9C0V/k/3qBblXyMxV5B0o/gpb6dFLp8ea+o= +github.com/gofiber/template/html/v2 v2.1.3/go.mod h1:U5Fxgc5KpyujU9OqKzy6Kn6Qup6Tm7zdsISR+VpnHRE= +github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM= +github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -497,6 +505,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= +github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM= github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -615,6 +625,8 @@ github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM= github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -630,6 +642,8 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8= +github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew= +github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= @@ -697,6 +711,12 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA= +github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= diff --git a/internal/biz/biz.go b/internal/biz/biz.go new file mode 100644 index 00000000..e0c04e3d --- /dev/null +++ b/internal/biz/biz.go @@ -0,0 +1,24 @@ +package biz + +import ( + "github.com/tuihub/librarian/internal/biz/bizbinah" + "github.com/tuihub/librarian/internal/biz/bizchesed" + "github.com/tuihub/librarian/internal/biz/bizgebura" + "github.com/tuihub/librarian/internal/biz/bizkether" + "github.com/tuihub/librarian/internal/biz/biznetzach" + "github.com/tuihub/librarian/internal/biz/biztiphereth" + "github.com/tuihub/librarian/internal/biz/bizyesod" + + "github.com/google/wire" +) + +// ProviderSet is biz providers. +var ProviderSet = wire.NewSet( + bizkether.ProviderSet, + biztiphereth.ProviderSet, + bizgebura.NewGebura, + bizbinah.ProviderSet, + bizyesod.ProviderSet, + biznetzach.ProviderSet, + bizchesed.ProviderSet, +) diff --git a/app/sephirah/internal/biz/bizbinah/binah.go b/internal/biz/bizbinah/binah.go similarity index 93% rename from app/sephirah/internal/biz/bizbinah/binah.go rename to internal/biz/bizbinah/binah.go index 9c095f82..b091ee80 100644 --- a/app/sephirah/internal/biz/bizbinah/binah.go +++ b/internal/biz/bizbinah/binah.go @@ -5,8 +5,8 @@ import ( "io" "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelbinah" "github.com/tuihub/librarian/internal/lib/libauth" + "github.com/tuihub/librarian/internal/model/modelbinah" "github.com/google/wire" ) diff --git a/app/sephirah/internal/biz/bizbinah/presigned.go b/internal/biz/bizbinah/presigned.go similarity index 100% rename from app/sephirah/internal/biz/bizbinah/presigned.go rename to internal/biz/bizbinah/presigned.go diff --git a/app/sephirah/internal/biz/bizbinah/simple.go b/internal/biz/bizbinah/simple.go similarity index 94% rename from app/sephirah/internal/biz/bizbinah/simple.go rename to internal/biz/bizbinah/simple.go index 4d5333ca..21b07604 100644 --- a/app/sephirah/internal/biz/bizbinah/simple.go +++ b/internal/biz/bizbinah/simple.go @@ -6,8 +6,8 @@ import ( "os" "strconv" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelbinah" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelbinah" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "github.com/go-kratos/kratos/v2/errors" diff --git a/app/sephirah/internal/biz/bizchesed/chesed.go b/internal/biz/bizchesed/chesed.go similarity index 89% rename from app/sephirah/internal/biz/bizchesed/chesed.go rename to internal/biz/bizchesed/chesed.go index a410b541..27300ff4 100644 --- a/app/sephirah/internal/biz/bizchesed/chesed.go +++ b/internal/biz/bizchesed/chesed.go @@ -5,10 +5,9 @@ import ( "strconv" "sync" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizbinah" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelbinah" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelchesed" + "github.com/tuihub/librarian/internal/biz/bizbinah" + "github.com/tuihub/librarian/internal/biz/bizutils" + "github.com/tuihub/librarian/internal/data" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/lib/libcache" "github.com/tuihub/librarian/internal/lib/libcron" @@ -16,6 +15,8 @@ import ( "github.com/tuihub/librarian/internal/lib/libsearch" "github.com/tuihub/librarian/internal/lib/libtime" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelbinah" + "github.com/tuihub/librarian/internal/model/modelchesed" miner "github.com/tuihub/protos/pkg/librarian/miner/v1" porter "github.com/tuihub/protos/pkg/librarian/porter/v1" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" @@ -29,16 +30,8 @@ var ProviderSet = wire.NewSet( NewImageCache, ) -type ChesedRepo interface { - CreateImage(context.Context, model.InternalID, *modelchesed.Image) error - ListImages(context.Context, model.InternalID, model.Paging) ([]*modelchesed.Image, int64, error) - ListImageNeedScan(context.Context) ([]*modelchesed.Image, error) - SetImageStatus(context.Context, model.InternalID, modelchesed.ImageStatus) error - GetImage(context.Context, model.InternalID, model.InternalID) (*modelchesed.Image, error) -} - type Chesed struct { - repo ChesedRepo + repo *data.ChesedRepo b bizbinah.BinahRepo id *libidgenerator.IDGenerator search libsearch.Search @@ -51,7 +44,7 @@ type Chesed struct { } func NewChesed( - repo ChesedRepo, + repo *data.ChesedRepo, b bizbinah.BinahRepo, id *libidgenerator.IDGenerator, search libsearch.Search, diff --git a/app/sephirah/internal/biz/bizgebura/app.go b/internal/biz/bizgebura/app.go similarity index 96% rename from app/sephirah/internal/biz/bizgebura/app.go rename to internal/biz/bizgebura/app.go index f8e671eb..3f26dea9 100644 --- a/app/sephirah/internal/biz/bizgebura/app.go +++ b/internal/biz/bizgebura/app.go @@ -3,10 +3,10 @@ package bizgebura import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelgebura" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "github.com/go-kratos/kratos/v2/errors" diff --git a/app/sephirah/internal/biz/bizgebura/app_info.go b/internal/biz/bizgebura/app_info.go similarity index 89% rename from app/sephirah/internal/biz/bizgebura/app_info.go rename to internal/biz/bizgebura/app_info.go index 22287e38..13954f2d 100644 --- a/app/sephirah/internal/biz/bizgebura/app_info.go +++ b/internal/biz/bizgebura/app_info.go @@ -5,13 +5,13 @@ import ( "fmt" "strconv" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelangela" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/lib/libsearch" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/model/modelkether" + "github.com/tuihub/librarian/internal/service/sephirah/converter" porter "github.com/tuihub/protos/pkg/librarian/porter/v1" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" @@ -22,7 +22,7 @@ func (g *Gebura) CreateAppInfo( ctx context.Context, appInfo *modelgebura.AppInfo, ) (*modelgebura.AppInfo, *errors.Error) { - if libauth.FromContextAssertUserType(ctx, libauth.UserTypeAdmin) == nil { + if libauth.FromContextAssertUserType(ctx, model.UserTypeAdmin) == nil { return nil, bizutils.NoPermissionError() } id, err := g.id.New() @@ -37,12 +37,12 @@ func (g *Gebura) CreateAppInfo( if err = g.repo.CreateAppInfo(ctx, appInfo); err != nil { return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error()) } - _ = g.updateAppInfoIndex.Publish(ctx, modelangela.UpdateAppInfoIndex{IDs: []model.InternalID{appInfo.ID}}) + _ = g.updateAppInfoIndex.Publish(ctx, modelkether.UpdateAppInfoIndex{IDs: []model.InternalID{appInfo.ID}}) return appInfo, nil } func (g *Gebura) UpdateAppInfo(ctx context.Context, appInfo *modelgebura.AppInfo) *errors.Error { - if libauth.FromContextAssertUserType(ctx, libauth.UserTypeAdmin) == nil { + if libauth.FromContextAssertUserType(ctx, model.UserTypeAdmin) == nil { return bizutils.NoPermissionError() } appInfo.Internal = true @@ -50,7 +50,7 @@ func (g *Gebura) UpdateAppInfo(ctx context.Context, appInfo *modelgebura.AppInfo if err != nil { return pb.ErrorErrorReasonUnspecified("%s", err.Error()) } - _ = g.updateAppInfoIndex.Publish(ctx, modelangela.UpdateAppInfoIndex{IDs: []model.InternalID{appInfo.ID}}) + _ = g.updateAppInfoIndex.Publish(ctx, modelkether.UpdateAppInfoIndex{IDs: []model.InternalID{appInfo.ID}}) return nil } @@ -62,7 +62,7 @@ func (g *Gebura) ListAppInfos( ids []model.InternalID, containDetails bool, ) ([]*modelgebura.AppInfo, int64, *errors.Error) { - if libauth.FromContextAssertUserType(ctx, libauth.UserTypeAdmin) == nil { + if libauth.FromContextAssertUserType(ctx, model.UserTypeAdmin) == nil { return nil, 0, bizutils.NoPermissionError() } infos, total, err := g.repo.ListAppInfos(ctx, paging, sources, types, ids, containDetails) @@ -73,7 +73,7 @@ func (g *Gebura) ListAppInfos( } func (g *Gebura) MergeAppInfos(ctx context.Context, base modelgebura.AppInfo, merged model.InternalID) *errors.Error { - if libauth.FromContextAssertUserType(ctx, libauth.UserTypeAdmin) == nil { + if libauth.FromContextAssertUserType(ctx, model.UserTypeAdmin) == nil { return bizutils.NoPermissionError() } if !base.Internal { @@ -82,7 +82,7 @@ func (g *Gebura) MergeAppInfos(ctx context.Context, base modelgebura.AppInfo, me if err := g.repo.MergeAppInfos(ctx, base, merged); err != nil { return pb.ErrorErrorReasonUnspecified("%s", err) } - _ = g.updateAppInfoIndex.Publish(ctx, modelangela.UpdateAppInfoIndex{IDs: []model.InternalID{base.ID}}) + _ = g.updateAppInfoIndex.Publish(ctx, modelkether.UpdateAppInfoIndex{IDs: []model.InternalID{base.ID}}) return nil } @@ -104,7 +104,7 @@ func (g *Gebura) SyncAppInfos( continue } if wait { - err = g.pullAppInfo.LocalCall(ctx, modelangela.PullAppInfo{ + err = g.pullAppInfo.LocalCall(ctx, modelkether.PullAppInfo{ ID: ids[i], AppInfoID: *infoID, IgnoreRateLimit: false, @@ -119,7 +119,7 @@ func (g *Gebura) SyncAppInfos( } appInfos = append(appInfos, app) } else { - _ = g.pullAppInfo.Publish(ctx, modelangela.PullAppInfo{ + _ = g.pullAppInfo.Publish(ctx, modelkether.PullAppInfo{ ID: ids[i], AppInfoID: *infoID, IgnoreRateLimit: false, diff --git a/app/sephirah/internal/biz/bizgebura/app_inst.go b/internal/biz/bizgebura/app_inst.go similarity index 92% rename from app/sephirah/internal/biz/bizgebura/app_inst.go rename to internal/biz/bizgebura/app_inst.go index d3cb8193..1bbd14a4 100644 --- a/app/sephirah/internal/biz/bizgebura/app_inst.go +++ b/internal/biz/bizgebura/app_inst.go @@ -3,10 +3,10 @@ package bizgebura import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelgebura" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "github.com/go-kratos/kratos/v2/errors" diff --git a/internal/biz/bizgebura/gebura.go b/internal/biz/bizgebura/gebura.go new file mode 100644 index 00000000..2b245904 --- /dev/null +++ b/internal/biz/bizgebura/gebura.go @@ -0,0 +1,58 @@ +package bizgebura + +import ( + "context" + + "github.com/tuihub/librarian/internal/data" + "github.com/tuihub/librarian/internal/lib/libauth" + "github.com/tuihub/librarian/internal/lib/libcache" + "github.com/tuihub/librarian/internal/lib/libidgenerator" + "github.com/tuihub/librarian/internal/lib/libmq" + "github.com/tuihub/librarian/internal/lib/libsearch" + "github.com/tuihub/librarian/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/model/modelkether" + "github.com/tuihub/librarian/internal/service/supervisor" + porter "github.com/tuihub/protos/pkg/librarian/porter/v1" + + "github.com/go-kratos/kratos/v2/errors" +) + +type ReportAppPackageHandler interface { + Handle(context.Context, []*modelgebura.AppBinary) *errors.Error +} + +type Gebura struct { + auth *libauth.Auth + repo *data.GeburaRepo + id *libidgenerator.IDGenerator + search libsearch.Search + porter porter.LibrarianPorterServiceClient + supv *supervisor.Supervisor + updateAppInfoIndex *libmq.Topic[modelkether.UpdateAppInfoIndex] + pullAppInfo *libmq.Topic[modelkether.PullAppInfo] + appInfoCache *libcache.Map[modelgebura.AppInfoID, modelgebura.AppInfo] +} + +func NewGebura( + repo *data.GeburaRepo, + auth *libauth.Auth, + id *libidgenerator.IDGenerator, + search libsearch.Search, + pClient porter.LibrarianPorterServiceClient, + supv *supervisor.Supervisor, + updateAppIndex *libmq.Topic[modelkether.UpdateAppInfoIndex], + pullAppInfo *libmq.Topic[modelkether.PullAppInfo], + appInfoCache *libcache.Map[modelgebura.AppInfoID, modelgebura.AppInfo], +) *Gebura { + return &Gebura{ + auth: auth, + repo: repo, + id: id, + search: search, + porter: pClient, + supv: supv, + updateAppInfoIndex: updateAppIndex, + pullAppInfo: pullAppInfo, + appInfoCache: appInfoCache, + } +} diff --git a/app/sephirah/internal/biz/bizgebura/run_time.go b/internal/biz/bizgebura/run_time.go similarity index 95% rename from app/sephirah/internal/biz/bizgebura/run_time.go rename to internal/biz/bizgebura/run_time.go index ec730803..59dea112 100644 --- a/app/sephirah/internal/biz/bizgebura/run_time.go +++ b/internal/biz/bizgebura/run_time.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/model" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" diff --git a/app/sephirah/internal/biz/bizangela/account.go b/internal/biz/bizkether/account.go similarity index 73% rename from app/sephirah/internal/biz/bizangela/account.go rename to internal/biz/bizkether/account.go index cf8610cd..9386b576 100644 --- a/app/sephirah/internal/biz/bizangela/account.go +++ b/internal/biz/bizkether/account.go @@ -1,26 +1,25 @@ -package bizangela +package bizkether import ( "context" "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelangela" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" "github.com/tuihub/librarian/internal/lib/libmq" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/model/modelkether" + "github.com/tuihub/librarian/internal/service/sephirah/converter" porter "github.com/tuihub/protos/pkg/librarian/porter/v1" librarian "github.com/tuihub/protos/pkg/librarian/v1" ) func NewPullAccountTopic( - a *AngelaBase, - sr *libmq.Topic[modelangela.PullAccountAppInfoRelation], -) *libmq.Topic[modeltiphereth.PullAccountInfo] { - return libmq.NewTopic[modeltiphereth.PullAccountInfo]( + a *KetherBase, + sr *libmq.Topic[modelkether.PullAccountAppInfoRelation], +) *libmq.Topic[model.PullAccountInfo] { + return libmq.NewTopic[model.PullAccountInfo]( "PullAccountInfo", - func(ctx context.Context, info *modeltiphereth.PullAccountInfo) error { + func(ctx context.Context, info *model.PullAccountInfo) error { if !a.supv.HasAccountPlatform(info.Platform) { return nil } @@ -34,7 +33,7 @@ func NewPullAccountTopic( if err != nil { return err } - err = a.repo.UpsertAccount(ctx, modeltiphereth.Account{ + err = a.repo.UpsertAccount(ctx, model.Account{ ID: info.ID, Platform: info.Platform, PlatformAccountID: info.PlatformAccountID, @@ -47,7 +46,7 @@ func NewPullAccountTopic( return err } return sr. - Publish(ctx, modelangela.PullAccountAppInfoRelation{ + Publish(ctx, modelkether.PullAccountAppInfoRelation{ ID: info.ID, Platform: info.Platform, PlatformAccountID: info.PlatformAccountID, @@ -57,12 +56,12 @@ func NewPullAccountTopic( } func NewPullAccountAppInfoRelationTopic( - a *AngelaBase, - sa *libmq.Topic[modelangela.PullAppInfo], -) *libmq.Topic[modelangela.PullAccountAppInfoRelation] { - return libmq.NewTopic[modelangela.PullAccountAppInfoRelation]( + a *KetherBase, + sa *libmq.Topic[modelkether.PullAppInfo], +) *libmq.Topic[modelkether.PullAccountAppInfoRelation] { + return libmq.NewTopic[modelkether.PullAccountAppInfoRelation]( "PullAccountAppInfoRelation", - func(ctx context.Context, r *modelangela.PullAccountAppInfoRelation) error { + func(ctx context.Context, r *modelkether.PullAccountAppInfoRelation) error { if !a.supv.HasAccountPlatform(r.Platform) { return nil } @@ -104,7 +103,7 @@ func NewPullAccountAppInfoRelationTopic( return err } for _, info := range infos { - _ = sa.Publish(ctx, modelangela.PullAppInfo{ + _ = sa.Publish(ctx, modelkether.PullAppInfo{ ID: info.ID, AppInfoID: modelgebura.AppInfoID{ Internal: false, diff --git a/app/sephirah/internal/biz/bizangela/app.go b/internal/biz/bizkether/app.go similarity index 79% rename from app/sephirah/internal/biz/bizangela/app.go rename to internal/biz/bizkether/app.go index 4d5b55a4..ccb36e9e 100644 --- a/app/sephirah/internal/biz/bizangela/app.go +++ b/internal/biz/bizkether/app.go @@ -1,30 +1,30 @@ -package bizangela +package bizkether import ( "context" "strconv" "time" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizgebura" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelangela" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/data" "github.com/tuihub/librarian/internal/lib/libcache" "github.com/tuihub/librarian/internal/lib/libmq" "github.com/tuihub/librarian/internal/lib/libtime" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/model/modelkether" + "github.com/tuihub/librarian/internal/service/sephirah/converter" porter "github.com/tuihub/protos/pkg/librarian/porter/v1" librarian "github.com/tuihub/protos/pkg/librarian/v1" ) func NewPullAppInfoTopic( - a *AngelaBase, + a *KetherBase, infoCache *libcache.Map[modelgebura.AppInfoID, modelgebura.AppInfo], - updateAppInfoIndex *libmq.Topic[modelangela.UpdateAppInfoIndex], -) *libmq.Topic[modelangela.PullAppInfo] { - return libmq.NewTopic[modelangela.PullAppInfo]( + updateAppInfoIndex *libmq.Topic[modelkether.UpdateAppInfoIndex], +) *libmq.Topic[modelkether.PullAppInfo] { + return libmq.NewTopic[modelkether.PullAppInfo]( "PullAppInfo", - func(ctx context.Context, r *modelangela.PullAppInfo) error { + func(ctx context.Context, r *modelkether.PullAppInfo) error { if !a.supv.HasAppInfoSource(r.AppInfoID.Source) { return nil } @@ -70,14 +70,14 @@ func NewPullAppInfoTopic( return err } _ = infoCache.Delete(ctx, r.AppInfoID) - _ = updateAppInfoIndex.Publish(ctx, modelangela.UpdateAppInfoIndex{IDs: []model.InternalID{id}}) + _ = updateAppInfoIndex.Publish(ctx, modelkether.UpdateAppInfoIndex{IDs: []model.InternalID{id}}) return nil }, ) } func NewAppInfoCache( - g bizgebura.GeburaRepo, + g *data.GeburaRepo, store libcache.Store, ) *libcache.Map[modelgebura.AppInfoID, modelgebura.AppInfo] { return libcache.NewMap[modelgebura.AppInfoID, modelgebura.AppInfo]( diff --git a/app/sephirah/internal/biz/bizangela/feed.go b/internal/biz/bizkether/feed.go similarity index 88% rename from app/sephirah/internal/biz/bizangela/feed.go rename to internal/biz/bizkether/feed.go index aeeec83f..d24dab95 100644 --- a/app/sephirah/internal/biz/bizangela/feed.go +++ b/internal/biz/bizkether/feed.go @@ -1,4 +1,4 @@ -package bizangela +package bizkether import ( "context" @@ -7,19 +7,19 @@ import ( "sort" "time" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizyesod" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelangela" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/biz/bizyesod" "github.com/tuihub/librarian/internal/lib/libmq" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelkether" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/service/sephirah/converter" porter "github.com/tuihub/protos/pkg/librarian/porter/v1" ) func NewPullFeedTopic( //nolint:gocognit // TODO - a *AngelaBase, - parse *libmq.Topic[modelangela.FeedItemPostprocess], + a *KetherBase, + parse *libmq.Topic[modelkether.FeedItemPostprocess], systemNotify *libmq.Topic[modelnetzach.SystemNotify], ) *libmq.Topic[modelyesod.PullFeed] { return libmq.NewTopic[modelyesod.PullFeed]( @@ -94,7 +94,7 @@ func NewPullFeedTopic( //nolint:gocognit // TODO // Queue FeedItemPostprocess for _, item := range feed.Items { if slices.Contains(newItemGUIDs, item.GUID) { - err = parse.Publish(ctx, modelangela.FeedItemPostprocess{ + err = parse.Publish(ctx, modelkether.FeedItemPostprocess{ FeedID: feed.ID, Item: item, SystemNotify: p.SystemNotify, @@ -110,13 +110,13 @@ func NewPullFeedTopic( //nolint:gocognit // TODO } func NewFeedItemPostprocessTopic( //nolint:gocognit // TODO - a *AngelaBase, - notify *libmq.Topic[modelangela.NotifyRouter], + a *KetherBase, + notify *libmq.Topic[modelkether.NotifyRouter], systemNotify *libmq.Topic[modelnetzach.SystemNotify], -) *libmq.Topic[modelangela.FeedItemPostprocess] { - return libmq.NewTopic[modelangela.FeedItemPostprocess]( +) *libmq.Topic[modelkether.FeedItemPostprocess] { + return libmq.NewTopic[modelkether.FeedItemPostprocess]( "FeedItemPostprocess", - func(ctx context.Context, p *modelangela.FeedItemPostprocess) error { + func(ctx context.Context, p *modelkether.FeedItemPostprocess) error { notifyMsg := p.SystemNotify if notifyMsg == nil { notifyMsg = new(modelnetzach.SystemNotify) @@ -195,7 +195,7 @@ func NewFeedItemPostprocessTopic( //nolint:gocognit // TODO notifyMsg.Notification.Content = fmt.Sprintf("UpsertFeedItems failed: %s", err.Error()) return err } - _ = notify.Publish(ctx, modelangela.NotifyRouter{ + _ = notify.Publish(ctx, modelkether.NotifyRouter{ FeedID: p.FeedID, Messages: []*modelfeed.Item{item}, }) diff --git a/app/sephirah/internal/biz/bizangela/index.go b/internal/biz/bizkether/index.go similarity index 69% rename from app/sephirah/internal/biz/bizangela/index.go rename to internal/biz/bizkether/index.go index 341eafdf..ebc552fd 100644 --- a/app/sephirah/internal/biz/bizangela/index.go +++ b/internal/biz/bizkether/index.go @@ -1,19 +1,19 @@ -package bizangela +package bizkether import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelangela" "github.com/tuihub/librarian/internal/lib/libmq" "github.com/tuihub/librarian/internal/lib/libsearch" + "github.com/tuihub/librarian/internal/model/modelkether" ) func NewUpdateAppInfoIndexTopic( - a *AngelaBase, -) *libmq.Topic[modelangela.UpdateAppInfoIndex] { - return libmq.NewTopic[modelangela.UpdateAppInfoIndex]( + a *KetherBase, +) *libmq.Topic[modelkether.UpdateAppInfoIndex] { + return libmq.NewTopic[modelkether.UpdateAppInfoIndex]( "UpdateAppInfoIndex", - func(ctx context.Context, r *modelangela.UpdateAppInfoIndex) error { + func(ctx context.Context, r *modelkether.UpdateAppInfoIndex) error { infos, err := a.g.GetBatchBoundAppInfos(ctx, r.IDs) if err != nil { return err diff --git a/internal/biz/bizkether/kether.go b/internal/biz/bizkether/kether.go new file mode 100644 index 00000000..57d17c86 --- /dev/null +++ b/internal/biz/bizkether/kether.go @@ -0,0 +1,105 @@ +package bizkether + +import ( + "github.com/tuihub/librarian/internal/data" + "github.com/tuihub/librarian/internal/lib/libidgenerator" + "github.com/tuihub/librarian/internal/lib/libmq" + "github.com/tuihub/librarian/internal/lib/libsearch" + "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelkether" + "github.com/tuihub/librarian/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/service/supervisor" + porter "github.com/tuihub/protos/pkg/librarian/porter/v1" + + "github.com/google/wire" +) + +var ProviderSet = wire.NewSet( + NewKether, + NewKetherBase, + NewPullAccountTopic, + NewPullAccountAppInfoRelationTopic, + NewPullAppInfoTopic, + NewAppInfoCache, + NewPullFeedTopic, + NewNotifyRouterTopic, + NewNotifyPushTopic, + NewFeedToNotifyFlowCache, + NewNotifyFlowCache, + NewNotifyTargetCache, + NewFeedItemPostprocessTopic, + NewUpdateAppInfoIndexTopic, +) + +type Kether struct { + KetherBase + mq *libmq.MQ +} +type KetherBase struct { + repo *data.KetherRepo + supv *supervisor.Supervisor + g *data.GeburaRepo + porter porter.LibrarianPorterServiceClient + search libsearch.Search + id *libidgenerator.IDGenerator +} + +func NewKetherBase( + repo *data.KetherRepo, + supv *supervisor.Supervisor, + g *data.GeburaRepo, + pClient porter.LibrarianPorterServiceClient, + search libsearch.Search, + id *libidgenerator.IDGenerator, +) (*KetherBase, error) { + return &KetherBase{ + repo: repo, + supv: supv, + g: g, + porter: pClient, + search: search, + id: id, + }, nil +} + +func NewKether( + base *KetherBase, + mq *libmq.MQ, + pullAccountInfo *libmq.Topic[model.PullAccountInfo], + pullAccountAppInfoRelation *libmq.Topic[modelkether.PullAccountAppInfoRelation], + pullAppInfo *libmq.Topic[modelkether.PullAppInfo], + pullFeed *libmq.Topic[modelyesod.PullFeed], + notifyRouter *libmq.Topic[modelkether.NotifyRouter], + notifyPush *libmq.Topic[modelkether.NotifyPush], + itemPostprocess *libmq.Topic[modelkether.FeedItemPostprocess], + updateAppIndex *libmq.Topic[modelkether.UpdateAppInfoIndex], +) (*Kether, error) { + if err := mq.RegisterTopic(pullAccountInfo); err != nil { + return nil, err + } + if err := mq.RegisterTopic(pullAccountAppInfoRelation); err != nil { + return nil, err + } + if err := mq.RegisterTopic(pullAppInfo); err != nil { + return nil, err + } + if err := mq.RegisterTopic(pullFeed); err != nil { + return nil, err + } + if err := mq.RegisterTopic(notifyRouter); err != nil { + return nil, err + } + if err := mq.RegisterTopic(notifyPush); err != nil { + return nil, err + } + if err := mq.RegisterTopic(itemPostprocess); err != nil { + return nil, err + } + if err := mq.RegisterTopic(updateAppIndex); err != nil { + return nil, err + } + return &Kether{ + KetherBase: *base, + mq: mq, + }, nil +} diff --git a/app/sephirah/internal/biz/bizangela/notify.go b/internal/biz/bizkether/notify.go similarity index 81% rename from app/sephirah/internal/biz/bizangela/notify.go rename to internal/biz/bizkether/notify.go index 85270256..a29e6d83 100644 --- a/app/sephirah/internal/biz/bizangela/notify.go +++ b/internal/biz/bizkether/notify.go @@ -1,4 +1,4 @@ -package bizangela +package bizkether import ( "context" @@ -6,27 +6,27 @@ import ( "strconv" "strings" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biznetzach" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelangela" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/data" "github.com/tuihub/librarian/internal/lib/libcache" "github.com/tuihub/librarian/internal/lib/libmq" "github.com/tuihub/librarian/internal/lib/libtime" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelkether" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/service/sephirah/converter" porter "github.com/tuihub/protos/pkg/librarian/porter/v1" ) func NewNotifyRouterTopic( //nolint:gocognit // TODO - a *AngelaBase, + a *KetherBase, flowMap *libcache.Map[model.InternalID, modelnetzach.NotifyFlow], - feedToFlowMap *libcache.Map[model.InternalID, modelangela.FeedToNotifyFlowValue], - push *libmq.Topic[modelangela.NotifyPush], -) *libmq.Topic[modelangela.NotifyRouter] { - return libmq.NewTopic[modelangela.NotifyRouter]( + feedToFlowMap *libcache.Map[model.InternalID, modelkether.FeedToNotifyFlowValue], + push *libmq.Topic[modelkether.NotifyPush], +) *libmq.Topic[modelkether.NotifyRouter] { + return libmq.NewTopic[modelkether.NotifyRouter]( "NotifyRouter", - func(ctx context.Context, r *modelangela.NotifyRouter) error { + func(ctx context.Context, r *modelkether.NotifyRouter) error { flowIDs, err := feedToFlowMap.Get(ctx, r.FeedID) if err != nil { return err @@ -63,7 +63,7 @@ func NewNotifyRouterTopic( //nolint:gocognit // TODO if target == nil { continue } - err = push.Publish(ctx, modelangela.NotifyPush{ + err = push.Publish(ctx, modelkether.NotifyPush{ Target: *target, Messages: applyFilter(messages, target.Filter.IncludeKeywords, target.Filter.ExcludeKeywords), }) @@ -82,12 +82,12 @@ func NewNotifyRouterTopic( //nolint:gocognit // TODO } func NewNotifyPushTopic( - a *AngelaBase, + a *KetherBase, targetMap *libcache.Map[model.InternalID, modelnetzach.NotifyTarget], -) *libmq.Topic[modelangela.NotifyPush] { - return libmq.NewTopic[modelangela.NotifyPush]( +) *libmq.Topic[modelkether.NotifyPush] { + return libmq.NewTopic[modelkether.NotifyPush]( "NotifyPush", - func(ctx context.Context, p *modelangela.NotifyPush) error { + func(ctx context.Context, p *modelkether.NotifyPush) error { target, err := targetMap.Get(ctx, p.Target.TargetID) if err != nil { return err @@ -115,21 +115,21 @@ func NewNotifyPushTopic( // NewFeedToNotifyFlowCache Cache-Aside Pattern. func NewFeedToNotifyFlowCache( - n biznetzach.NetzachRepo, + n *data.NetzachRepo, store libcache.Store, -) *libcache.Map[model.InternalID, modelangela.FeedToNotifyFlowValue] { - return libcache.NewMap[model.InternalID, modelangela.FeedToNotifyFlowValue]( +) *libcache.Map[model.InternalID, modelkether.FeedToNotifyFlowValue] { + return libcache.NewMap[model.InternalID, modelkether.FeedToNotifyFlowValue]( store, "FeedToNotifyFlow", func(k model.InternalID) string { return strconv.FormatInt(int64(k), 10) }, - func(ctx context.Context, id model.InternalID) (*modelangela.FeedToNotifyFlowValue, error) { + func(ctx context.Context, id model.InternalID) (*modelkether.FeedToNotifyFlowValue, error) { res, err := n.GetNotifyFlowIDsWithFeed(ctx, id) if err != nil { return nil, err } - return (*modelangela.FeedToNotifyFlowValue)(&res), nil + return (*modelkether.FeedToNotifyFlowValue)(&res), nil }, libcache.WithExpiration(libtime.SevenDays), ) @@ -137,7 +137,7 @@ func NewFeedToNotifyFlowCache( // NewNotifyFlowCache Cache-Aside Pattern. func NewNotifyFlowCache( - n biznetzach.NetzachRepo, + n *data.NetzachRepo, store libcache.Store, ) *libcache.Map[model.InternalID, modelnetzach.NotifyFlow] { return libcache.NewMap[model.InternalID, modelnetzach.NotifyFlow]( @@ -159,7 +159,7 @@ func NewNotifyFlowCache( // NewNotifyTargetCache Cache-Aside Pattern. func NewNotifyTargetCache( - n biznetzach.NetzachRepo, + n *data.NetzachRepo, store libcache.Store, ) *libcache.Map[model.InternalID, modelnetzach.NotifyTarget] { return libcache.NewMap[model.InternalID, modelnetzach.NotifyTarget]( diff --git a/app/sephirah/internal/biz/bizangela/porter.go b/internal/biz/bizkether/porter.go similarity index 62% rename from app/sephirah/internal/biz/bizangela/porter.go rename to internal/biz/bizkether/porter.go index 6187e44c..16622248 100644 --- a/app/sephirah/internal/biz/bizangela/porter.go +++ b/internal/biz/bizkether/porter.go @@ -1,17 +1,17 @@ -package bizangela +package bizkether import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) -func (a *Angela) PorterGetNotifyTargetItems(ctx context.Context, id model.InternalID, paging model.Paging) (*modelsupervisor.FeatureRequest, []*modelfeed.Item, error) { - claims := libauth.FromContextAssertUserType(ctx, libauth.UserTypePorter) +func (a *Kether) PorterGetNotifyTargetItems(ctx context.Context, id model.InternalID, paging model.Paging) (*modelsupervisor.FeatureRequest, []*modelfeed.Item, error) { + claims := libauth.FromContextAssertUserType(ctx, model.UserTypePorter) if claims == nil { return nil, nil, bizutils.NoPermissionError() } diff --git a/app/sephirah/internal/biz/biznetzach/netzach.go b/internal/biz/biznetzach/netzach.go similarity index 79% rename from app/sephirah/internal/biz/biznetzach/netzach.go rename to internal/biz/biznetzach/netzach.go index 56481e96..0e08304a 100644 --- a/app/sephirah/internal/biz/biznetzach/netzach.go +++ b/internal/biz/biznetzach/netzach.go @@ -3,10 +3,8 @@ package biznetzach import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelangela" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - "github.com/tuihub/librarian/app/sephirah/internal/supervisor" + "github.com/tuihub/librarian/internal/biz/bizutils" + "github.com/tuihub/librarian/internal/data" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/lib/libcache" "github.com/tuihub/librarian/internal/lib/libidgenerator" @@ -14,6 +12,9 @@ import ( "github.com/tuihub/librarian/internal/lib/libsearch" "github.com/tuihub/librarian/internal/lib/logger" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelkether" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/service/supervisor" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "github.com/go-kratos/kratos/v2/errors" @@ -25,43 +26,23 @@ var ProviderSet = wire.NewSet( NewSystemNotificationTopic, ) -type NetzachRepo interface { - CreateNotifyTarget(context.Context, model.InternalID, *modelnetzach.NotifyTarget) error - UpdateNotifyTarget(context.Context, model.InternalID, *modelnetzach.NotifyTarget) error - ListNotifyTargets(context.Context, model.Paging, model.InternalID, []model.InternalID, - []modelnetzach.NotifyTargetStatus) ( - []*modelnetzach.NotifyTarget, int64, error) - GetNotifyTarget(context.Context, model.InternalID) (*modelnetzach.NotifyTarget, error) - CreateNotifyFlow(context.Context, model.InternalID, *modelnetzach.NotifyFlow) error - UpdateNotifyFlow(context.Context, model.InternalID, *modelnetzach.NotifyFlow) error - ListNotifyFlows(context.Context, model.Paging, model.InternalID, []model.InternalID) ( - []*modelnetzach.NotifyFlow, int64, error) - GetNotifyFlow(context.Context, model.InternalID) (*modelnetzach.NotifyFlow, error) - GetNotifyFlowIDsWithFeed(context.Context, model.InternalID) ([]model.InternalID, error) - - UpsertSystemNotification(context.Context, model.InternalID, *modelnetzach.SystemNotification) error - ListSystemNotifications(context.Context, model.Paging, *model.InternalID, []modelnetzach.SystemNotificationType, - []modelnetzach.SystemNotificationLevel, []modelnetzach.SystemNotificationStatus) ( - []*modelnetzach.SystemNotification, int64, error) -} - type Netzach struct { - repo NetzachRepo + repo *data.NetzachRepo supv *supervisor.Supervisor id *libidgenerator.IDGenerator search libsearch.Search - notifySourceCache *libcache.Map[model.InternalID, modelangela.FeedToNotifyFlowValue] + notifySourceCache *libcache.Map[model.InternalID, modelkether.FeedToNotifyFlowValue] notifyFlowCache *libcache.Map[model.InternalID, modelnetzach.NotifyFlow] notifyTargetCache *libcache.Map[model.InternalID, modelnetzach.NotifyTarget] } func NewNetzach( - repo NetzachRepo, + repo *data.NetzachRepo, supv *supervisor.Supervisor, id *libidgenerator.IDGenerator, search libsearch.Search, mq *libmq.MQ, - notifySourceCache *libcache.Map[model.InternalID, modelangela.FeedToNotifyFlowValue], + notifySourceCache *libcache.Map[model.InternalID, modelkether.FeedToNotifyFlowValue], notifyFlowCache *libcache.Map[model.InternalID, modelnetzach.NotifyFlow], notifyTargetCache *libcache.Map[model.InternalID, modelnetzach.NotifyTarget], systemNotification *libmq.Topic[modelnetzach.SystemNotify], @@ -246,7 +227,7 @@ func (n *Netzach) ListSystemNotifications( return nil, 0, bizutils.NoPermissionError() } var userID *model.InternalID - if claims.UserType != libauth.UserTypeAdmin { + if claims.UserType != model.UserTypeAdmin { types = []modelnetzach.SystemNotificationType{modelnetzach.SystemNotificationTypeUser} userID = &claims.UserID } diff --git a/app/sephirah/internal/biz/biznetzach/system.go b/internal/biz/biznetzach/system.go similarity index 82% rename from app/sephirah/internal/biz/biznetzach/system.go rename to internal/biz/biznetzach/system.go index d0c77b78..6b213fa0 100644 --- a/app/sephirah/internal/biz/biznetzach/system.go +++ b/internal/biz/biznetzach/system.go @@ -3,13 +3,14 @@ package biznetzach import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/data" "github.com/tuihub/librarian/internal/lib/libidgenerator" "github.com/tuihub/librarian/internal/lib/libmq" + "github.com/tuihub/librarian/internal/model/modelnetzach" ) func NewSystemNotificationTopic( - repo NetzachRepo, + repo *data.NetzachRepo, idGenerator *libidgenerator.IDGenerator, ) *libmq.Topic[modelnetzach.SystemNotify] { return libmq.NewTopic[modelnetzach.SystemNotify]( diff --git a/app/sephirah/internal/biz/biztiphereth/account.go b/internal/biz/biztiphereth/account.go similarity index 81% rename from app/sephirah/internal/biz/biztiphereth/account.go rename to internal/biz/biztiphereth/account.go index cf5f2b12..66f24daf 100644 --- a/app/sephirah/internal/biz/biztiphereth/account.go +++ b/internal/biz/biztiphereth/account.go @@ -3,8 +3,7 @@ package biztiphereth import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/lib/logger" "github.com/tuihub/librarian/internal/model" @@ -15,8 +14,8 @@ import ( func (t *Tiphereth) LinkAccount( ctx context.Context, - a modeltiphereth.Account, -) (*modeltiphereth.Account, *errors.Error) { + a model.Account, +) (*model.Account, *errors.Error) { claims := libauth.FromContextAssertUserType(ctx) if claims == nil { return nil, bizutils.NoPermissionError() @@ -29,7 +28,7 @@ func (t *Tiphereth) LinkAccount( return nil, pb.ErrorErrorReasonUnspecified("%s", err) } a.ID = id - if err = t.pullAccount.LocalCall(ctx, modeltiphereth.PullAccountInfo{ + if err = t.pullAccount.LocalCall(ctx, model.PullAccountInfo{ ID: a.ID, Platform: a.Platform, PlatformAccountID: a.PlatformAccountID, @@ -44,7 +43,7 @@ func (t *Tiphereth) LinkAccount( return &a, nil } -func (t *Tiphereth) UnLinkAccount(ctx context.Context, a modeltiphereth.Account) *errors.Error { +func (t *Tiphereth) UnLinkAccount(ctx context.Context, a model.Account) *errors.Error { claims := libauth.FromContextAssertUserType(ctx) if claims == nil { return bizutils.NoPermissionError() @@ -60,7 +59,7 @@ func (t *Tiphereth) UnLinkAccount(ctx context.Context, a modeltiphereth.Account) func (t *Tiphereth) ListLinkAccounts( ctx context.Context, id model.InternalID, -) ([]*modeltiphereth.Account, *errors.Error) { +) ([]*model.Account, *errors.Error) { claims := libauth.FromContextAssertUserType(ctx) if claims == nil { return nil, bizutils.NoPermissionError() diff --git a/app/sephirah/internal/biz/biztiphereth/porter.go b/internal/biz/biztiphereth/porter.go similarity index 86% rename from app/sephirah/internal/biz/biztiphereth/porter.go rename to internal/biz/biztiphereth/porter.go index 027a162d..5dee5afb 100644 --- a/app/sephirah/internal/biz/biztiphereth/porter.go +++ b/internal/biz/biztiphereth/porter.go @@ -3,12 +3,11 @@ package biztiphereth import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/lib/logger" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "github.com/go-kratos/kratos/v2/errors" @@ -40,7 +39,7 @@ func (t *Tiphereth) updatePorters(ctx context.Context) error { } for i, porter := range newPorters { porter.ID = ids[i] - porter.Status = modeltiphereth.UserStatusBlocked + porter.Status = model.UserStatusBlocked } err = t.repo.UpsertPorters(ctx, newPorters) if err != nil { @@ -54,7 +53,7 @@ func (t *Tiphereth) ListPorters( ctx context.Context, paging model.Paging, ) ([]*modelsupervisor.PorterInstance, int64, *errors.Error) { - if libauth.FromContextAssertUserType(ctx, libauth.UserTypeAdmin) == nil { + if libauth.FromContextAssertUserType(ctx, model.UserTypeAdmin) == nil { return nil, 0, bizutils.NoPermissionError() } porters, total, err := t.repo.ListPorters(ctx, paging) @@ -67,9 +66,9 @@ func (t *Tiphereth) ListPorters( func (t *Tiphereth) UpdatePorterStatus( ctx context.Context, id model.InternalID, - status modeltiphereth.UserStatus, + status model.UserStatus, ) *errors.Error { - if libauth.FromContextAssertUserType(ctx, libauth.UserTypeAdmin) == nil { + if libauth.FromContextAssertUserType(ctx, model.UserTypeAdmin) == nil { return bizutils.NoPermissionError() } pi, err := t.repo.UpdatePorterStatus(ctx, id, status) @@ -127,14 +126,14 @@ func (t *Tiphereth) UpdatePorterContext( func (t *Tiphereth) ListPorterGroups( ctx context.Context, paging model.Paging, - status []modeltiphereth.UserStatus, + status []model.UserStatus, ) ([]*modelsupervisor.PorterGroup, int64, *errors.Error) { claims := libauth.FromContextAssertUserType(ctx) if claims == nil { return nil, 0, bizutils.NoPermissionError() } - if claims.UserType != libauth.UserTypeAdmin { - status = []modeltiphereth.UserStatus{modeltiphereth.UserStatusActive} + if claims.UserType != model.UserTypeAdmin { + status = []model.UserStatus{model.UserStatusActive} } groups, err := t.repo.ListPorterGroups(ctx, status) if err != nil { diff --git a/app/sephirah/internal/biz/biztiphereth/tiphereth.go b/internal/biz/biztiphereth/tiphereth.go similarity index 52% rename from app/sephirah/internal/biz/biztiphereth/tiphereth.go rename to internal/biz/biztiphereth/tiphereth.go index 86f74bc6..4c06fd2e 100644 --- a/app/sephirah/internal/biz/biztiphereth/tiphereth.go +++ b/internal/biz/biztiphereth/tiphereth.go @@ -4,9 +4,7 @@ import ( "context" "strconv" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/supervisor" + "github.com/tuihub/librarian/internal/data" "github.com/tuihub/librarian/internal/lib/libapp" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/lib/libcache" @@ -17,6 +15,8 @@ import ( "github.com/tuihub/librarian/internal/lib/libtime" "github.com/tuihub/librarian/internal/lib/logger" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/service/supervisor" "github.com/google/wire" ) @@ -28,61 +28,28 @@ var ProviderSet = wire.NewSet( NewPorterContextCache, ) -type TipherethRepo interface { - FetchUserByPassword(context.Context, string, string) (*modeltiphereth.User, error) - CreateUser(context.Context, *modeltiphereth.User, model.InternalID) error - UpdateUser(context.Context, *modeltiphereth.User, string) error - ListUsers(context.Context, model.Paging, []model.InternalID, - []libauth.UserType, []modeltiphereth.UserStatus, []model.InternalID, - model.InternalID) ([]*modeltiphereth.User, int64, error) - GetUserCount(context.Context) (int, error) - LinkAccount(context.Context, modeltiphereth.Account, model.InternalID) (model.InternalID, error) - UnLinkAccount(context.Context, modeltiphereth.Account, model.InternalID) error - ListLinkAccounts(context.Context, model.InternalID) ([]*modeltiphereth.Account, error) - GetUser(context.Context, model.InternalID) (*modeltiphereth.User, error) - UpsertPorters(context.Context, []*modelsupervisor.PorterInstance) error - ListPorters(context.Context, model.Paging) ([]*modelsupervisor.PorterInstance, int64, error) - FetchPorterByAddress(context.Context, string) (*modelsupervisor.PorterInstance, error) - UpdatePorterStatus(context.Context, model.InternalID, - modeltiphereth.UserStatus) (*modelsupervisor.PorterInstance, error) - CreatePorterContext(context.Context, model.InternalID, *modelsupervisor.PorterContext) error - GetEnabledPorterContexts(context.Context) ([]*modelsupervisor.PorterContext, error) - ListPorterContexts(context.Context, model.InternalID, model.Paging) ([]*modelsupervisor.PorterContext, int64, error) - UpdatePorterContext(context.Context, model.InternalID, *modelsupervisor.PorterContext) error - FetchPorterContext(context.Context, model.InternalID) (*modelsupervisor.PorterContext, error) - CreateDevice(context.Context, model.InternalID, *modeltiphereth.DeviceInfo, *string) (model.InternalID, error) - ListUserSessions(context.Context, model.InternalID) ([]*modeltiphereth.UserSession, error) - DeleteUserSession(context.Context, model.InternalID, model.InternalID) error - FetchDeviceInfo(context.Context, model.InternalID) (*modeltiphereth.DeviceInfo, error) - CreateUserSession(context.Context, *modeltiphereth.UserSession) error - FetchUserSession(context.Context, model.InternalID, string) (*modeltiphereth.UserSession, error) - UpdateUserSession(context.Context, *modeltiphereth.UserSession) error - ListDevices(context.Context, model.InternalID) ([]*modeltiphereth.DeviceInfo, error) - ListPorterGroups(context.Context, []modeltiphereth.UserStatus) ([]*modelsupervisor.PorterGroup, error) -} - type Tiphereth struct { app *libapp.Settings auth *libauth.Auth - repo TipherethRepo + repo *data.TipherethRepo supv *supervisor.Supervisor id *libidgenerator.IDGenerator search libsearch.Search - pullAccount *libmq.Topic[modeltiphereth.PullAccountInfo] - userCountCache *libcache.Key[modeltiphereth.UserCount] + pullAccount *libmq.Topic[model.PullAccountInfo] + userCountCache *libcache.Key[model.UserCount] porterInstanceCache *libcache.Map[string, modelsupervisor.PorterInstance] } func NewTiphereth( app *libapp.Settings, - repo TipherethRepo, + repo *data.TipherethRepo, auth *libauth.Auth, supv *supervisor.Supervisor, id *libidgenerator.IDGenerator, search libsearch.Search, - pullAccount *libmq.Topic[modeltiphereth.PullAccountInfo], + pullAccount *libmq.Topic[model.PullAccountInfo], cron *libcron.Cron, - userCountCache *libcache.Key[modeltiphereth.UserCount], + userCountCache *libcache.Key[model.UserCount], porterInstanceCache *libcache.Map[string, modelsupervisor.PorterInstance], ) (*Tiphereth, error) { t := &Tiphereth{ @@ -117,25 +84,25 @@ func (t *Tiphereth) CreateConfiguredAdmin() { if !(t.app.EnvExist(libapp.EnvDemoMode) || t.app.EnvExist(libapp.EnvCreateAdminUserName)) { return } - user := &modeltiphereth.User{ + user := &model.User{ ID: 0, - UserName: demoAdminUserName, - PassWord: demoAdminPassword, - Type: libauth.UserTypeAdmin, - Status: modeltiphereth.UserStatusActive, + Username: demoAdminUserName, + Password: demoAdminPassword, + Type: model.UserTypeAdmin, + Status: model.UserStatusActive, } if username, err := t.app.Env(libapp.EnvCreateAdminUserName); err == nil && username != "" { - user.UserName = username + user.Username = username } if password, err := t.app.Env(libapp.EnvCreateAdminPassword); err == nil && password != "" { - user.PassWord = password + user.Password = password } - password, err := t.auth.GeneratePassword(user.PassWord) + password, err := t.auth.GeneratePassword(user.Password) if err != nil { logger.Infof("generate password failed: %s", err.Error()) return } - user.PassWord = password + user.Password = password id, err := t.id.New() if err != nil { return @@ -157,25 +124,25 @@ func (t *Tiphereth) CreateConfiguredAdmin() { } func NewUserCountCache( - t TipherethRepo, + t *data.TipherethRepo, store libcache.Store, -) *libcache.Key[modeltiphereth.UserCount] { - return libcache.NewKey[modeltiphereth.UserCount]( +) *libcache.Key[model.UserCount] { + return libcache.NewKey[model.UserCount]( store, "UserCount", - func(ctx context.Context) (*modeltiphereth.UserCount, error) { + func(ctx context.Context) (*model.UserCount, error) { res, err := t.GetUserCount(ctx) if err != nil { return nil, err } - return &modeltiphereth.UserCount{Count: res}, nil + return &model.UserCount{Count: res}, nil }, libcache.WithExpiration(libtime.SevenDays), ) } func NewPorterInstanceCache( - t TipherethRepo, + t *data.TipherethRepo, store libcache.Store, ) *libcache.Map[string, modelsupervisor.PorterInstance] { return libcache.NewMap[string, modelsupervisor.PorterInstance]( @@ -192,7 +159,7 @@ func NewPorterInstanceCache( } func NewPorterContextCache( - t TipherethRepo, + t *data.TipherethRepo, store libcache.Store, ) *libcache.Map[model.InternalID, modelsupervisor.PorterContext] { return libcache.NewMap[model.InternalID, modelsupervisor.PorterContext]( diff --git a/app/sephirah/internal/biz/biztiphereth/token.go b/internal/biz/biztiphereth/token.go similarity index 84% rename from app/sephirah/internal/biz/biztiphereth/token.go rename to internal/biz/biztiphereth/token.go index 0e92d250..4a5b8031 100644 --- a/app/sephirah/internal/biz/biztiphereth/token.go +++ b/internal/biz/biztiphereth/token.go @@ -4,8 +4,7 @@ import ( "context" "time" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/lib/libtime" "github.com/tuihub/librarian/internal/lib/logger" @@ -23,7 +22,7 @@ func (t *Tiphereth) GetToken( ctx context.Context, username, password string, deviceID *model.InternalID, -) (modeltiphereth.AccessToken, modeltiphereth.RefreshToken, *errors.Error) { +) (model.AccessToken, model.RefreshToken, *errors.Error) { password, err := t.auth.GeneratePassword(password) if err != nil { logger.Infof("generate password failed: %s", err.Error()) @@ -35,7 +34,7 @@ func (t *Tiphereth) GetToken( logger.Infof("FetchUserByPassword failed: %s", err.Error()) return "", "", pb.ErrorErrorReasonUnauthorized("invalid user or password") } - if user.Status != modeltiphereth.UserStatusActive { + if user.Status != model.UserStatusActive { return "", "", pb.ErrorErrorReasonUnauthorized("user not active") } @@ -43,7 +42,7 @@ func (t *Tiphereth) GetToken( if err != nil { return "", "", pb.ErrorErrorReasonUnspecified("%s", err.Error()) } - userSession := &modeltiphereth.UserSession{ + userSession := &model.UserSession{ ID: sessionID, UserID: user.ID, RefreshToken: "", @@ -90,15 +89,15 @@ func (t *Tiphereth) GetToken( logger.Infof("create user session failed: %s", err.Error()) return "", "", pb.ErrorErrorReasonUnspecified("%s", err.Error()) } - return modeltiphereth.AccessToken(accessToken), modeltiphereth.RefreshToken(refreshToken), nil + return model.AccessToken(accessToken), model.RefreshToken(refreshToken), nil } func (t *Tiphereth) RefreshToken( //nolint:gocognit // TODO ctx context.Context, deviceID *model.InternalID, -) (modeltiphereth.AccessToken, modeltiphereth.RefreshToken, *errors.Error) { +) (model.AccessToken, model.RefreshToken, *errors.Error) { claims := libauth.FromContextAssertUserType(ctx, - libauth.UserTypeAdmin, libauth.UserTypeNormal, libauth.UserTypeSentinel, libauth.UserTypePorter) + model.UserTypeAdmin, model.UserTypeNormal, model.UserTypeSentinel, model.UserTypePorter) if claims == nil { return "", "", bizutils.NoPermissionError() } @@ -107,9 +106,9 @@ func (t *Tiphereth) RefreshToken( //nolint:gocognit // TODO return "", "", bizutils.NoPermissionError() } needUpdate := false - session := new(modeltiphereth.UserSession) + session := new(model.UserSession) var err error - if claims.UserType != libauth.UserTypePorter { //nolint:nestif // TODO + if claims.UserType != model.UserTypePorter { //nolint:nestif // TODO session, err = t.repo.FetchUserSession(ctx, claims.UserID, oldRefreshToken) if err != nil { return "", "", bizutils.NoPermissionError() @@ -159,21 +158,21 @@ func (t *Tiphereth) RefreshToken( //nolint:gocognit // TODO session.ExpireAt = time.Now().Add(refreshTokenExpire) needUpdate = true } - if claims.UserType != libauth.UserTypePorter && needUpdate { + if claims.UserType != model.UserTypePorter && needUpdate { err = t.repo.UpdateUserSession(ctx, session) if err != nil { logger.Infof("update user session failed: %s", err.Error()) return "", "", pb.ErrorErrorReasonUnspecified("%s", err.Error()) } } - return modeltiphereth.AccessToken(accessToken), modeltiphereth.RefreshToken(refreshToken), nil + return model.AccessToken(accessToken), model.RefreshToken(refreshToken), nil } func (t *Tiphereth) AcquireUserToken( ctx context.Context, userID model.InternalID, -) (modeltiphereth.AccessToken, *errors.Error) { - claims := libauth.FromContextAssertUserType(ctx, libauth.UserTypePorter) +) (model.AccessToken, *errors.Error) { + claims := libauth.FromContextAssertUserType(ctx, model.UserTypePorter) if claims == nil || claims.PorterID != 0 { return "", bizutils.NoPermissionError() } @@ -182,7 +181,7 @@ func (t *Tiphereth) AcquireUserToken( userID, claims.UserID, libauth.ClaimsTypeAccessToken, - libauth.UserTypeNormal, + model.UserTypeNormal, nil, libtime.Day, ) @@ -190,12 +189,12 @@ func (t *Tiphereth) AcquireUserToken( logger.Infof("generate access token failed: %s", err.Error()) return "", pb.ErrorErrorReasonUnspecified("%s", err.Error()) } - return modeltiphereth.AccessToken(accessToken), nil + return model.AccessToken(accessToken), nil } func (t *Tiphereth) RegisterDevice( ctx context.Context, - device *modeltiphereth.DeviceInfo, + device *model.DeviceInfo, clientLocalID *string, ) (model.InternalID, *errors.Error) { claims := libauth.FromContextAssertUserType(ctx) @@ -214,7 +213,7 @@ func (t *Tiphereth) RegisterDevice( return id, nil } -func (t *Tiphereth) ListRegisteredDevices(ctx context.Context) ([]*modeltiphereth.DeviceInfo, *errors.Error) { +func (t *Tiphereth) ListRegisteredDevices(ctx context.Context) ([]*model.DeviceInfo, *errors.Error) { claims := libauth.FromContextAssertUserType(ctx) if claims == nil { return nil, bizutils.NoPermissionError() @@ -226,7 +225,7 @@ func (t *Tiphereth) ListRegisteredDevices(ctx context.Context) ([]*modeltipheret return devices, nil } -func (t *Tiphereth) ListUserSessions(ctx context.Context) ([]*modeltiphereth.UserSession, *errors.Error) { +func (t *Tiphereth) ListUserSessions(ctx context.Context) ([]*model.UserSession, *errors.Error) { claims := libauth.FromContextAssertUserType(ctx) if claims == nil { return nil, bizutils.NoPermissionError() diff --git a/app/sephirah/internal/biz/biztiphereth/user.go b/internal/biz/biztiphereth/user.go similarity index 77% rename from app/sephirah/internal/biz/biztiphereth/user.go rename to internal/biz/biztiphereth/user.go index b864e660..4c0a6047 100644 --- a/app/sephirah/internal/biz/biztiphereth/user.go +++ b/internal/biz/biztiphereth/user.go @@ -5,8 +5,7 @@ import ( "context" "strconv" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libapp" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/lib/logger" @@ -14,28 +13,27 @@ import ( pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "github.com/dchest/captcha" - "github.com/go-kratos/kratos/v2/errors" ) -func (t *Tiphereth) CreateUser(ctx context.Context, user *modeltiphereth.User) (*model.InternalID, *errors.Error) { +func (t *Tiphereth) CreateUser(ctx context.Context, user *model.User) (*model.User, error) { claims := libauth.FromContextAssertUserType(ctx) if claims == nil { return nil, bizutils.NoPermissionError() } - if claims.UserType != libauth.UserTypeAdmin && user.Type != libauth.UserTypeSentinel { + if claims.UserType != model.UserTypeAdmin && user.Type != model.UserTypeSentinel { return nil, bizutils.NoPermissionError() } if t.app.EnvExist(libapp.EnvDemoMode) { - if user.Type == libauth.UserTypeAdmin { + if user.Type == model.UserTypeAdmin { return nil, pb.ErrorErrorReasonForbidden("server running in demo mode, create admin user is not allowed") } } - password, err := t.auth.GeneratePassword(user.PassWord) + password, err := t.auth.GeneratePassword(user.Password) if err != nil { logger.Infof("generate password failed: %s", err.Error()) return nil, pb.ErrorErrorReasonBadRequest("invalid password") } - user.PassWord = password + user.Password = password id, err := t.id.New() if err != nil { return nil, pb.ErrorErrorReasonUnspecified("%s", err) @@ -55,13 +53,12 @@ func (t *Tiphereth) CreateUser(ctx context.Context, user *modeltiphereth.User) ( return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error()) } _ = t.userCountCache.Delete(ctx) - res := user.ID - return &res, nil + return user, nil } func (t *Tiphereth) UpdateUser( - ctx context.Context, user *modeltiphereth.User, originPassword string, -) *errors.Error { + ctx context.Context, user *model.User, originPassword string, +) error { claims := libauth.FromContextAssertUserType(ctx) if claims == nil { return bizutils.NoPermissionError() @@ -69,15 +66,15 @@ func (t *Tiphereth) UpdateUser( if user.ID == 0 { return pb.ErrorErrorReasonBadRequest("internal id required") } - if user.PassWord != "" && originPassword == "" { + if user.Password != "" && originPassword == "" { return pb.ErrorErrorReasonBadRequest("password required") } if t.app.EnvExist(libapp.EnvDemoMode) { - if user.Type == libauth.UserTypeAdmin { + if user.Type == model.UserTypeAdmin { return pb.ErrorErrorReasonForbidden("server running in demo mode, modify admin user is not allowed") } } - if claims.UserType != libauth.UserTypeAdmin && + if claims.UserType != model.UserTypeAdmin && claims.UserID != user.ID { res, _, err := t.repo.ListUsers(ctx, model.Paging{ @@ -85,22 +82,21 @@ func (t *Tiphereth) UpdateUser( PageNum: 1, }, []model.InternalID{user.ID}, - []libauth.UserType{libauth.UserTypeSentinel}, + []model.UserType{model.UserTypeSentinel}, nil, nil, - claims.UserID, ) if err != nil || len(res) != 1 || res[0].ID != user.ID { return bizutils.NoPermissionError() } } - if user.PassWord != "" { - password, err := t.auth.GeneratePassword(user.PassWord) + if user.Password != "" { + password, err := t.auth.GeneratePassword(user.Password) if err != nil { logger.Infof("generate password failed: %s", err.Error()) return pb.ErrorErrorReasonBadRequest("invalid password") } - user.PassWord = password + user.Password = password originPassword, err = t.auth.GeneratePassword(originPassword) if err != nil { logger.Infof("generate password failed: %s", err.Error()) @@ -115,21 +111,21 @@ func (t *Tiphereth) UpdateUser( } func (t *Tiphereth) ListUsers( - ctx context.Context, paging model.Paging, types []libauth.UserType, statuses []modeltiphereth.UserStatus, -) ([]*modeltiphereth.User, int64, *errors.Error) { - claims := libauth.FromContextAssertUserType(ctx) + ctx context.Context, paging model.Paging, types []model.UserType, statuses []model.UserStatus, +) ([]*model.User, int64, error) { + claims := libauth.FromContextAssertUserType(ctx, model.UserTypeAdmin) if claims == nil { return nil, 0, bizutils.NoPermissionError() } var exclude []model.InternalID - users, total, err := t.repo.ListUsers(ctx, paging, nil, types, statuses, exclude, claims.UserID) + users, total, err := t.repo.ListUsers(ctx, paging, nil, types, statuses, exclude) if err != nil { return nil, 0, pb.ErrorErrorReasonUnspecified("%s", err.Error()) } return users, total, nil } -func (t *Tiphereth) GetUser(ctx context.Context, id *model.InternalID) (*modeltiphereth.User, *errors.Error) { +func (t *Tiphereth) GetUser(ctx context.Context, id *model.InternalID) (*model.User, error) { claims := libauth.FromContextAssertUserType(ctx) if claims == nil { return nil, bizutils.NoPermissionError() @@ -151,8 +147,8 @@ func (t *Tiphereth) RegisterUser( ctx context.Context, username string, password string, - captchaReq *modeltiphereth.CaptchaAns, -) (*modeltiphereth.CaptchaQue, string, *errors.Error) { + captchaReq *model.CaptchaAns, +) (*model.CaptchaQue, string, error) { if t.app.EnvExist(libapp.EnvDemoMode) { return nil, "", pb.ErrorErrorReasonForbidden("server running in demo mode, register user is not allowed") } @@ -170,7 +166,7 @@ func (t *Tiphereth) RegisterUser( if err != nil { return nil, "", pb.ErrorErrorReasonUnspecified("%s", err.Error()) } - return &modeltiphereth.CaptchaQue{ + return &model.CaptchaQue{ ID: captchaID, Image: captchaImg.Bytes(), }, "", nil @@ -187,12 +183,12 @@ func (t *Tiphereth) RegisterUser( if err != nil { return nil, "", pb.ErrorErrorReasonUnspecified("%s", err) } - user := &modeltiphereth.User{ + user := &model.User{ ID: id, - UserName: username, - PassWord: passwordParsed, - Type: libauth.UserTypeNormal, - Status: modeltiphereth.UserStatusActive, + Username: username, + Password: passwordParsed, + Type: model.UserTypeNormal, + Status: model.UserStatusActive, } if err = t.repo.CreateUser(ctx, user, user.ID); err != nil { logger.Infof("repo CreateUser failed: %s", err.Error()) @@ -202,7 +198,7 @@ func (t *Tiphereth) RegisterUser( return nil, "TODO", nil // TODO: return refresh token } -func (t *Tiphereth) checkCapacity(ctx context.Context) *errors.Error { +func (t *Tiphereth) checkCapacity(ctx context.Context) error { if !t.app.EnvExist(libapp.EnvUserCapacity) { return nil } diff --git a/app/sephirah/internal/biz/bizutils/utils.go b/internal/biz/bizutils/utils.go similarity index 100% rename from app/sephirah/internal/biz/bizutils/utils.go rename to internal/biz/bizutils/utils.go diff --git a/app/sephirah/internal/biz/bizyesod/builtin_action.go b/internal/biz/bizyesod/builtin_action.go similarity index 97% rename from app/sephirah/internal/biz/bizyesod/builtin_action.go rename to internal/biz/bizyesod/builtin_action.go index 26a4414a..5cccdfbc 100644 --- a/app/sephirah/internal/biz/bizyesod/builtin_action.go +++ b/internal/biz/bizyesod/builtin_action.go @@ -5,10 +5,10 @@ import ( "net/url" "strings" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" "github.com/tuihub/librarian/internal/lib/libcodec" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/model/modelyesod" "github.com/PuerkitoBio/goquery" ) diff --git a/app/sephirah/internal/biz/bizyesod/collection.go b/internal/biz/bizyesod/collection.go similarity index 95% rename from app/sephirah/internal/biz/bizyesod/collection.go rename to internal/biz/bizyesod/collection.go index e89de57f..01410f43 100644 --- a/app/sephirah/internal/biz/bizyesod/collection.go +++ b/internal/biz/bizyesod/collection.go @@ -3,10 +3,10 @@ package bizyesod import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelyesod" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "github.com/go-kratos/kratos/v2/errors" diff --git a/app/sephirah/internal/biz/bizyesod/feed.go b/internal/biz/bizyesod/feed.go similarity index 97% rename from app/sephirah/internal/biz/bizyesod/feed.go rename to internal/biz/bizyesod/feed.go index fdb591a4..bfdc127e 100644 --- a/app/sephirah/internal/biz/bizyesod/feed.go +++ b/internal/biz/bizyesod/feed.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelyesod" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "github.com/go-kratos/kratos/v2/errors" diff --git a/app/sephirah/internal/biz/bizyesod/feed_action.go b/internal/biz/bizyesod/feed_action.go similarity index 92% rename from app/sephirah/internal/biz/bizyesod/feed_action.go rename to internal/biz/bizyesod/feed_action.go index a52cc322..a9349e9b 100644 --- a/app/sephirah/internal/biz/bizyesod/feed_action.go +++ b/internal/biz/bizyesod/feed_action.go @@ -3,10 +3,10 @@ package bizyesod import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelyesod" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "github.com/go-kratos/kratos/v2/errors" diff --git a/app/sephirah/internal/biz/bizyesod/feed_config.go b/internal/biz/bizyesod/feed_config.go similarity index 94% rename from app/sephirah/internal/biz/bizyesod/feed_config.go rename to internal/biz/bizyesod/feed_config.go index f48558a4..d0c542f8 100644 --- a/app/sephirah/internal/biz/bizyesod/feed_config.go +++ b/internal/biz/bizyesod/feed_config.go @@ -3,10 +3,10 @@ package bizyesod import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizutils" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/biz/bizutils" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelyesod" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "github.com/go-kratos/kratos/v2/errors" diff --git a/app/sephirah/internal/biz/bizyesod/yesod.go b/internal/biz/bizyesod/yesod.go similarity index 50% rename from app/sephirah/internal/biz/bizyesod/yesod.go rename to internal/biz/bizyesod/yesod.go index b039d803..c416d5cc 100644 --- a/app/sephirah/internal/biz/bizyesod/yesod.go +++ b/internal/biz/bizyesod/yesod.go @@ -6,11 +6,7 @@ import ( "strconv" "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" - "github.com/tuihub/librarian/app/sephirah/internal/supervisor" + "github.com/tuihub/librarian/internal/data" "github.com/tuihub/librarian/internal/lib/libcache" "github.com/tuihub/librarian/internal/lib/libcron" "github.com/tuihub/librarian/internal/lib/libidgenerator" @@ -19,7 +15,10 @@ import ( "github.com/tuihub/librarian/internal/lib/libtime" "github.com/tuihub/librarian/internal/lib/logger" "github.com/tuihub/librarian/internal/model" - "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/service/supervisor" "github.com/google/wire" ) @@ -29,57 +28,26 @@ var ProviderSet = wire.NewSet( NewFeedOwnerCache, ) -type YesodRepo interface { - CreateFeedConfig(context.Context, model.InternalID, *modelyesod.FeedConfig) error - UpdateFeedConfig(context.Context, model.InternalID, *modelyesod.FeedConfig) error - ListFeedCategories(context.Context, model.InternalID) ([]string, error) - ListFeedPlatforms(context.Context, model.InternalID) ([]string, error) - ListFeedConfigNeedPull(context.Context, []string, []modelyesod.FeedConfigStatus, - modelyesod.ListFeedOrder, time.Time, int) ([]*modelyesod.FeedConfig, error) - UpdateFeedConfigAsInQueue(context.Context, model.InternalID) error - ListFeedConfigs(context.Context, model.InternalID, model.Paging, []model.InternalID, - []modelyesod.FeedConfigStatus, []string) ([]*modelyesod.FeedWithConfig, int, error) - ListFeedItems(context.Context, model.InternalID, model.Paging, []model.InternalID, - []string, []string, *model.TimeRange, []string) ([]*modelyesod.FeedItemDigest, int, error) - GroupFeedItems(context.Context, model.InternalID, []model.TimeRange, []model.InternalID, - []string, []string, int, []string) ( - map[model.TimeRange][]*modelyesod.FeedItemDigest, error) - GetFeedItems(context.Context, model.InternalID, []model.InternalID) ([]*modelfeed.Item, error) - ReadFeedItem(context.Context, model.InternalID, model.InternalID) error - CreateFeedItemCollection(context.Context, model.InternalID, *modelyesod.FeedItemCollection) error - UpdateFeedItemCollection(context.Context, model.InternalID, *modelyesod.FeedItemCollection) error - ListFeedItemCollections(context.Context, model.InternalID, model.Paging, []model.InternalID, - []string) ([]*modelyesod.FeedItemCollection, int, error) - AddFeedItemToCollection(context.Context, model.InternalID, model.InternalID, model.InternalID) error - RemoveFeedItemFromCollection(context.Context, model.InternalID, model.InternalID, model.InternalID) error - ListFeedItemsInCollection(context.Context, model.InternalID, model.Paging, []model.InternalID, []string, - []string, []string, *model.TimeRange) ([]*modelyesod.FeedItemDigest, int, error) - GetFeedOwner(context.Context, model.InternalID) (*modeltiphereth.User, error) - CreateFeedActionSet(context.Context, model.InternalID, *modelyesod.FeedActionSet) error - UpdateFeedActionSet(context.Context, model.InternalID, *modelyesod.FeedActionSet) error - ListFeedActionSets(context.Context, model.InternalID, model.Paging) ([]*modelyesod.FeedActionSet, int, error) -} - type Yesod struct { - repo YesodRepo + repo *data.YesodRepo supv *supervisor.Supervisor id *libidgenerator.IDGenerator search libsearch.Search pullFeed *libmq.Topic[modelyesod.PullFeed] systemNotify *libmq.Topic[modelnetzach.SystemNotify] - feedOwner *libcache.Map[modelyesod.FeedConfig, modeltiphereth.User] + feedOwner *libcache.Map[modelyesod.FeedConfig, model.User] builtinFeedActions []*modelsupervisor.FeatureFlag } func NewYesod( - repo YesodRepo, + repo *data.YesodRepo, supv *supervisor.Supervisor, cron *libcron.Cron, id *libidgenerator.IDGenerator, search libsearch.Search, pullFeed *libmq.Topic[modelyesod.PullFeed], systemNotify *libmq.Topic[modelnetzach.SystemNotify], - feedOwner *libcache.Map[modelyesod.FeedConfig, modeltiphereth.User], + feedOwner *libcache.Map[modelyesod.FeedConfig, model.User], ) (*Yesod, error) { builtinFeedActions, err := getBuiltinActionFeatureFlags() if err != nil { @@ -117,7 +85,7 @@ func (y *Yesod) PullFeeds(ctx context.Context) error { var errRes error for _, c := range configs { doNotify := func() *modelnetzach.SystemNotify { - var owner *modeltiphereth.User + var owner *model.User owner, err = y.feedOwner.Get(ctx, *c) if err != nil { return nil @@ -158,16 +126,16 @@ func (y *Yesod) PullFeeds(ctx context.Context) error { } func NewFeedOwnerCache( - repo YesodRepo, + repo *data.YesodRepo, store libcache.Store, -) *libcache.Map[modelyesod.FeedConfig, modeltiphereth.User] { - return libcache.NewMap[modelyesod.FeedConfig, modeltiphereth.User]( +) *libcache.Map[modelyesod.FeedConfig, model.User] { + return libcache.NewMap[modelyesod.FeedConfig, model.User]( store, "FeedOwner", func(k modelyesod.FeedConfig) string { return strconv.FormatInt(int64(k.ID), 10) }, - func(ctx context.Context, fc modelyesod.FeedConfig) (*modeltiphereth.User, error) { + func(ctx context.Context, fc modelyesod.FeedConfig) (*model.User, error) { res, err := repo.GetFeedOwner(ctx, fc.ID) if err != nil { return nil, err diff --git a/app/sephirah/internal/client/client.go b/internal/client/client/client.go similarity index 100% rename from app/sephirah/internal/client/client.go rename to internal/client/client/client.go diff --git a/app/sephirah/internal/client/porter.go b/internal/client/client/porter.go similarity index 100% rename from app/sephirah/internal/client/porter.go rename to internal/client/client/porter.go diff --git a/app/sephirah/internal/client/porter_static_discovery.go b/internal/client/client/porter_static_discovery.go similarity index 100% rename from app/sephirah/internal/client/porter_static_discovery.go rename to internal/client/client/porter_static_discovery.go diff --git a/app/sephirah/internal/data/binah.go b/internal/data/binah.go similarity index 97% rename from app/sephirah/internal/data/binah.go rename to internal/data/binah.go index 71f3203f..9b7c742a 100644 --- a/app/sephirah/internal/data/binah.go +++ b/internal/data/binah.go @@ -6,7 +6,7 @@ import ( "net/url" "time" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizbinah" + "github.com/tuihub/librarian/internal/biz/bizbinah" "github.com/tuihub/librarian/internal/conf" "github.com/tuihub/librarian/internal/lib/logger" diff --git a/app/sephirah/internal/data/chesed.go b/internal/data/chesed.go similarity index 56% rename from app/sephirah/internal/data/chesed.go rename to internal/data/chesed.go index ad1615f6..665ae0a7 100644 --- a/app/sephirah/internal/data/chesed.go +++ b/internal/data/chesed.go @@ -3,26 +3,25 @@ package data import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizchesed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/converter" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelchesed" + "github.com/tuihub/librarian/internal/data/internal/converter" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelchesed" ) -type chesedRepo struct { +type ChesedRepo struct { data *Data } // NewChesedRepo . -func NewChesedRepo(data *Data) bizchesed.ChesedRepo { - return &chesedRepo{ +func NewChesedRepo(data *Data) *ChesedRepo { + return &ChesedRepo{ data: data, } } -func (c chesedRepo) CreateImage(ctx context.Context, userID model.InternalID, image *modelchesed.Image) error { +func (c *ChesedRepo) CreateImage(ctx context.Context, userID model.InternalID, image *modelchesed.Image) error { return c.data.db.Image.Create(). SetID(image.ID). SetName(image.Name). @@ -33,7 +32,7 @@ func (c chesedRepo) CreateImage(ctx context.Context, userID model.InternalID, im Exec(ctx) } -func (c chesedRepo) ListImages(ctx context.Context, userID model.InternalID, paging model.Paging) ( +func (c *ChesedRepo) ListImages(ctx context.Context, userID model.InternalID, paging model.Paging) ( []*modelchesed.Image, int64, error) { q := c.data.db.Image.Query(). Where( @@ -53,7 +52,7 @@ func (c chesedRepo) ListImages(ctx context.Context, userID model.InternalID, pag return converter.ToBizImageList(res), int64(total), nil } -func (c chesedRepo) ListImageNeedScan(ctx context.Context) ([]*modelchesed.Image, error) { +func (c *ChesedRepo) ListImageNeedScan(ctx context.Context) ([]*modelchesed.Image, error) { res, err := c.data.db.Image.Query(). Where(image.StatusEQ(image.StatusUploaded)). Limit(10). //nolint:mnd //TODO @@ -64,13 +63,13 @@ func (c chesedRepo) ListImageNeedScan(ctx context.Context) ([]*modelchesed.Image return converter.ToBizImageList(res), nil } -func (c chesedRepo) SetImageStatus(ctx context.Context, id model.InternalID, status modelchesed.ImageStatus) error { +func (c *ChesedRepo) SetImageStatus(ctx context.Context, id model.InternalID, status modelchesed.ImageStatus) error { return c.data.db.Image.UpdateOneID(id). SetStatus(converter.ToEntImageStatus(status)). Exec(ctx) } -func (c chesedRepo) GetImage(ctx context.Context, userID model.InternalID, id model.InternalID) ( +func (c *ChesedRepo) GetImage(ctx context.Context, userID model.InternalID, id model.InternalID) ( *modelchesed.Image, error) { res, err := c.data.db.Image.Query(). Where( diff --git a/app/sephirah/internal/data/data.go b/internal/data/data.go similarity index 94% rename from app/sephirah/internal/data/data.go rename to internal/data/data.go index a61cbaeb..6ff1ad37 100644 --- a/app/sephirah/internal/data/data.go +++ b/internal/data/data.go @@ -7,9 +7,9 @@ import ( "path" "slices" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/migrate" "github.com/tuihub/librarian/internal/conf" + "github.com/tuihub/librarian/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/data/internal/ent/migrate" "github.com/tuihub/librarian/internal/lib/libapp" "github.com/tuihub/librarian/internal/lib/logger" @@ -29,7 +29,7 @@ var ProviderSet = wire.NewSet( NewYesodRepo, NewNetzachRepo, NewChesedRepo, - NewAngelaRepo, + NewKetherRepo, NewBinahRepo, ) diff --git a/app/sephirah/internal/data/gebura.go b/internal/data/gebura.go similarity index 84% rename from app/sephirah/internal/data/gebura.go rename to internal/data/gebura.go index 8e698553..e74f56e9 100644 --- a/app/sephirah/internal/data/gebura.go +++ b/internal/data/gebura.go @@ -5,30 +5,29 @@ import ( "errors" "time" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizgebura" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/converter" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinstruntime" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/data/internal/converter" + "github.com/tuihub/librarian/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/appinstruntime" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelgebura" ) -type geburaRepo struct { +type GeburaRepo struct { data *Data } // NewGeburaRepo . -func NewGeburaRepo(data *Data) bizgebura.GeburaRepo { - return &geburaRepo{ +func NewGeburaRepo(data *Data) *GeburaRepo { + return &GeburaRepo{ data: data, } } -func (g geburaRepo) CreateAppInfo(ctx context.Context, a *modelgebura.AppInfo) error { +func (g *GeburaRepo) CreateAppInfo(ctx context.Context, a *modelgebura.AppInfo) error { if a.Details == nil { a.Details = new(modelgebura.AppInfoDetails) } @@ -53,7 +52,7 @@ func (g geburaRepo) CreateAppInfo(ctx context.Context, a *modelgebura.AppInfo) e return q.Exec(ctx) } -func (g geburaRepo) CreateAppInfoOrGet(ctx context.Context, a *modelgebura.AppInfo) (*modelgebura.AppInfo, error) { +func (g *GeburaRepo) CreateAppInfoOrGet(ctx context.Context, a *modelgebura.AppInfo) (*modelgebura.AppInfo, error) { err := g.CreateAppInfo(ctx, a) if err == nil { return a, nil @@ -72,7 +71,7 @@ func (g geburaRepo) CreateAppInfoOrGet(ctx context.Context, a *modelgebura.AppIn return nil, err } -func (g geburaRepo) UpdateAppInfo(ctx context.Context, a *modelgebura.AppInfo) error { +func (g *GeburaRepo) UpdateAppInfo(ctx context.Context, a *modelgebura.AppInfo) error { q := g.data.db.AppInfo.Update(). Where( appinfo.IDEQ(a.ID), @@ -97,7 +96,7 @@ func (g geburaRepo) UpdateAppInfo(ctx context.Context, a *modelgebura.AppInfo) e return q.Exec(ctx) } -func (g geburaRepo) ListAppInfos( +func (g *GeburaRepo) ListAppInfos( ctx context.Context, paging model.Paging, sources []string, @@ -149,7 +148,7 @@ func (g geburaRepo) ListAppInfos( return infos, int64(total), nil } -func (g geburaRepo) MergeAppInfos(ctx context.Context, base modelgebura.AppInfo, merged model.InternalID) error { +func (g *GeburaRepo) MergeAppInfos(ctx context.Context, base modelgebura.AppInfo, merged model.InternalID) error { err := g.data.WithTx(ctx, func(tx *ent.Tx) error { baseAppInfo := converter.ToEntAppInfo(base) err := tx.AppInfo.UpdateOne(&baseAppInfo).Exec(ctx) @@ -194,7 +193,7 @@ func (g geburaRepo) MergeAppInfos(ctx context.Context, base modelgebura.AppInfo, return err } -func (g geburaRepo) GetAppInfo(ctx context.Context, id modelgebura.AppInfoID) (*modelgebura.AppInfo, error) { +func (g *GeburaRepo) GetAppInfo(ctx context.Context, id modelgebura.AppInfoID) (*modelgebura.AppInfo, error) { res, err := g.data.db.AppInfo.Query(). Where( appinfo.InternalEQ(id.Internal), @@ -208,7 +207,7 @@ func (g geburaRepo) GetAppInfo(ctx context.Context, id modelgebura.AppInfoID) (* return converter.ToBizAppInfo(res), nil } -func (g geburaRepo) GetBoundAppInfos(ctx context.Context, id model.InternalID) ([]*modelgebura.AppInfo, error) { +func (g *GeburaRepo) GetBoundAppInfos(ctx context.Context, id model.InternalID) ([]*modelgebura.AppInfo, error) { a, err := g.data.db.AppInfo.Get(ctx, id) if err != nil { return nil, err @@ -224,7 +223,7 @@ func (g geburaRepo) GetBoundAppInfos(ctx context.Context, id model.InternalID) ( return converter.ToBizAppInfoList(append(externalApps, internalApp)), nil } -func (g geburaRepo) GetBatchBoundAppInfos( +func (g *GeburaRepo) GetBatchBoundAppInfos( ctx context.Context, ids []model.InternalID, ) ([]*modelgebura.BoundAppInfos, error) { @@ -254,7 +253,7 @@ func (g geburaRepo) GetBatchBoundAppInfos( return res, nil } -func (g geburaRepo) PurchaseAppInfo( +func (g *GeburaRepo) PurchaseAppInfo( ctx context.Context, userID model.InternalID, appID *modelgebura.AppInfoID, @@ -295,7 +294,7 @@ func (g geburaRepo) PurchaseAppInfo( return a.Edges.BindInternal.ID, err } -func (g geburaRepo) GetPurchasedAppInfos( +func (g *GeburaRepo) GetPurchasedAppInfos( ctx context.Context, id model.InternalID, source string, @@ -326,7 +325,7 @@ func (g geburaRepo) GetPurchasedAppInfos( return res, nil } -func (g geburaRepo) CreateApp(ctx context.Context, userID model.InternalID, ap *modelgebura.App) error { +func (g *GeburaRepo) CreateApp(ctx context.Context, userID model.InternalID, ap *modelgebura.App) error { q := g.data.db.App.Create(). SetOwnerID(userID). SetID(ap.ID). @@ -336,7 +335,7 @@ func (g geburaRepo) CreateApp(ctx context.Context, userID model.InternalID, ap * return q.Exec(ctx) } -func (g geburaRepo) UpdateApp(ctx context.Context, ownerID model.InternalID, ap *modelgebura.App) error { +func (g *GeburaRepo) UpdateApp(ctx context.Context, ownerID model.InternalID, ap *modelgebura.App) error { q := g.data.db.App.Update(). Where( app.IDEQ(ap.ID), @@ -348,7 +347,7 @@ func (g geburaRepo) UpdateApp(ctx context.Context, ownerID model.InternalID, ap return q.Exec(ctx) } -func (g geburaRepo) ListApps( +func (g *GeburaRepo) ListApps( ctx context.Context, paging model.Paging, ownerIDs []model.InternalID, @@ -390,7 +389,7 @@ func (g geburaRepo) ListApps( return res, total, nil } -func (g geburaRepo) AssignApp( +func (g *GeburaRepo) AssignApp( ctx context.Context, userID model.InternalID, appID model.InternalID, @@ -406,7 +405,7 @@ func (g geburaRepo) AssignApp( return err } -func (g geburaRepo) UnAssignApp( +func (g *GeburaRepo) UnAssignApp( ctx context.Context, userID model.InternalID, appID model.InternalID, @@ -436,7 +435,7 @@ func (g geburaRepo) UnAssignApp( // Strings(ctx) //} -func (g geburaRepo) CreateAppInst(ctx context.Context, ownerID model.InternalID, inst *modelgebura.AppInst) error { +func (g *GeburaRepo) CreateAppInst(ctx context.Context, ownerID model.InternalID, inst *modelgebura.AppInst) error { _, err := g.data.db.App.Query().Where( app.IDEQ(inst.AppID), app.HasOwnerWith(user.IDEQ(ownerID)), @@ -452,7 +451,7 @@ func (g geburaRepo) CreateAppInst(ctx context.Context, ownerID model.InternalID, return q.Exec(ctx) } -func (g geburaRepo) UpdateAppInst(ctx context.Context, ownerID model.InternalID, inst *modelgebura.AppInst) error { +func (g *GeburaRepo) UpdateAppInst(ctx context.Context, ownerID model.InternalID, inst *modelgebura.AppInst) error { _, err := g.data.db.App.Query().Where( app.IDEQ(inst.AppID), app.HasOwnerWith(user.IDEQ(ownerID)), @@ -469,7 +468,7 @@ func (g geburaRepo) UpdateAppInst(ctx context.Context, ownerID model.InternalID, return q.Exec(ctx) } -func (g geburaRepo) ListAppInsts( +func (g *GeburaRepo) ListAppInsts( ctx context.Context, ownerID model.InternalID, paging model.Paging, @@ -501,7 +500,7 @@ func (g geburaRepo) ListAppInsts( return converter.ToBizAppInstList(insts), total, nil } -func (g geburaRepo) AddAppInstRunTime( +func (g *GeburaRepo) AddAppInstRunTime( ctx context.Context, userID model.InternalID, instID model.InternalID, @@ -515,7 +514,7 @@ func (g geburaRepo) AddAppInstRunTime( Exec(ctx) } -func (g geburaRepo) SumAppInstRunTime( +func (g *GeburaRepo) SumAppInstRunTime( ctx context.Context, userID model.InternalID, instID model.InternalID, diff --git a/app/sephirah/internal/data/internal/converter/biz_to_ent.go b/internal/data/internal/converter/biz_to_ent.go similarity index 72% rename from app/sephirah/internal/data/internal/converter/biz_to_ent.go rename to internal/data/internal/converter/biz_to_ent.go index 403b73f0..d5920f6c 100644 --- a/app/sephirah/internal/data/internal/converter/biz_to_ent.go +++ b/internal/data/internal/converter/biz_to_ent.go @@ -1,30 +1,29 @@ package converter import ( - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelchesed" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" - "github.com/tuihub/librarian/internal/lib/libauth" + "github.com/tuihub/librarian/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelchesed" + "github.com/tuihub/librarian/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/model/modelyesod" ) // goverter:converter // goverter:output:format function // goverter:output:file ./generated.go -// goverter:output:package github.com/tuihub/librarian/app/sephirah/internal/data/internal/converter +// goverter:output:package github.com/tuihub/librarian/internal/data/internal/converter // goverter:matchIgnoreCase // goverter:ignoreUnexported type toEntConverter interface { //nolint:unused // used by generator @@ -34,14 +33,14 @@ type toEntConverter interface { //nolint:unused // used by generator // goverter:enum:map UserTypeNormal TypeNormal // goverter:enum:map UserTypeSentinel TypeSentinel // goverter:enum:map UserTypePorter @ignore - ToEntUserType(libauth.UserType) user.Type - ToEntUserTypeList([]libauth.UserType) []user.Type + ToEntUserType(model.UserType) user.Type + ToEntUserTypeList([]model.UserType) []user.Type // goverter:enum:unknown @ignore // goverter:enum:map UserStatusUnspecified @ignore // goverter:enum:map UserStatusActive StatusActive // goverter:enum:map UserStatusBlocked StatusBlocked - ToEntUserStatus(modeltiphereth.UserStatus) user.Status - ToEntUserStatusList([]modeltiphereth.UserStatus) []user.Status + ToEntUserStatus(model.UserStatus) user.Status + ToEntUserStatusList([]model.UserStatus) []user.Status // goverter:enum:unknown @ignore // goverter:enum:map SystemTypeUnspecified @ignore @@ -51,14 +50,14 @@ type toEntConverter interface { //nolint:unused // used by generator // goverter:enum:map SystemTypeMacOS SystemTypeMacos // goverter:enum:map SystemTypeLinux SystemTypeLinux // goverter:enum:map SystemTypeWeb SystemTypeWeb - ToEntSystemType(modeltiphereth.SystemType) deviceinfo.SystemType + ToEntSystemType(model.SystemType) deviceinfo.SystemType // goverter:enum:unknown @ignore // goverter:enum:map UserStatusUnspecified @ignore // goverter:enum:map UserStatusActive StatusActive // goverter:enum:map UserStatusBlocked StatusBlocked - ToEntPorterInstanceStatus(modeltiphereth.UserStatus) porterinstance.Status - ToEntPorterInstanceStatusList([]modeltiphereth.UserStatus) []porterinstance.Status + ToEntPorterInstanceStatus(model.UserStatus) porterinstance.Status + ToEntPorterInstanceStatusList([]model.UserStatus) []porterinstance.Status // goverter:enum:unknown @ignore // goverter:enum:map PorterContextStatusUnspecified @ignore diff --git a/app/sephirah/internal/data/internal/converter/converter.go b/internal/data/internal/converter/converter.go similarity index 91% rename from app/sephirah/internal/data/internal/converter/converter.go rename to internal/data/internal/converter/converter.go index e63d8c21..20bd7f7b 100644 --- a/app/sephirah/internal/data/internal/converter/converter.go +++ b/internal/data/internal/converter/converter.go @@ -5,9 +5,9 @@ package converter import ( "strings" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/model/modelyesod" ) //go:generate go run github.com/jmattheis/goverter/cmd/goverter gen . diff --git a/app/sephirah/internal/data/internal/converter/ent_to_biz.go b/internal/data/internal/converter/ent_to_biz.go similarity index 74% rename from app/sephirah/internal/data/internal/converter/ent_to_biz.go rename to internal/data/internal/converter/ent_to_biz.go index de3ae0bb..29b66921 100644 --- a/app/sephirah/internal/data/internal/converter/ent_to_biz.go +++ b/internal/data/internal/converter/ent_to_biz.go @@ -3,57 +3,56 @@ package converter import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelchesed" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" - "github.com/tuihub/librarian/internal/lib/libauth" + "github.com/tuihub/librarian/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelchesed" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/model/modelyesod" ) // goverter:converter // goverter:output:format function // goverter:output:file ./generated.go -// goverter:output:package github.com/tuihub/librarian/app/sephirah/internal/data/internal/converter +// goverter:output:package github.com/tuihub/librarian/internal/data/internal/converter // goverter:matchIgnoreCase // goverter:ignoreUnexported // goverter:enum:exclude time:Duration // goverter:extend TimeToTime // goverter:extend TimeToTimePtr type toBizConverter interface { //nolint:unused // used by generator - // goverter:ignore PassWord - ToBizUser(*ent.User) *modeltiphereth.User - ToBizUserList([]*ent.User) []*modeltiphereth.User + // goverter:ignore Password + ToBizUser(*ent.User) *model.User + ToBizUserList([]*ent.User) []*model.User // goverter:enum:unknown UserTypeUnspecified // goverter:enum:map TypeAdmin UserTypeAdmin // goverter:enum:map TypeNormal UserTypeNormal // goverter:enum:map TypeSentinel UserTypeSentinel - ToLibAuthUserType(user.Type) libauth.UserType + ToLibAuthUserType(user.Type) model.UserType // goverter:enum:unknown UserStatusUnspecified // goverter:enum:map StatusActive UserStatusActive // goverter:enum:map StatusBlocked UserStatusBlocked - ToBizUserStatus(user.Status) modeltiphereth.UserStatus + ToBizUserStatus(user.Status) model.UserStatus // goverter:ignore DeviceInfo // goverter:map CreatedAt CreateAt - ToBizUserSession(*ent.UserSession) *modeltiphereth.UserSession - ToBizUserSessionList([]*ent.UserSession) []*modeltiphereth.UserSession + ToBizUserSession(*ent.UserSession) *model.UserSession + ToBizUserSessionList([]*ent.UserSession) []*model.UserSession - ToBizDeviceInfo(*ent.DeviceInfo) *modeltiphereth.DeviceInfo - ToBizDeviceInfoList([]*ent.DeviceInfo) []*modeltiphereth.DeviceInfo + ToBizDeviceInfo(*ent.DeviceInfo) *model.DeviceInfo + ToBizDeviceInfoList([]*ent.DeviceInfo) []*model.DeviceInfo // goverter:enum:unknown SystemTypeUnspecified // goverter:enum:map SystemTypeUnknown SystemTypeUnspecified // goverter:enum:map SystemTypeIos SystemTypeIOS @@ -62,11 +61,11 @@ type toBizConverter interface { //nolint:unused // used by generator // goverter:enum:map SystemTypeWindows SystemTypeWindows // goverter:enum:map SystemTypeMacos SystemTypeMacOS // goverter:enum:map SystemTypeLinux SystemTypeLinux - ToBizSystemType(deviceinfo.SystemType) modeltiphereth.SystemType + ToBizSystemType(deviceinfo.SystemType) model.SystemType // goverter:map UpdatedAt LatestUpdateTime - ToBizAccount(*ent.Account) *modeltiphereth.Account - ToBizAccountList([]*ent.Account) []*modeltiphereth.Account + ToBizAccount(*ent.Account) *model.Account + ToBizAccountList([]*ent.Account) []*model.Account // goverter:map . BinarySummary ToBizPorter(*ent.PorterInstance) *modelsupervisor.PorterInstance @@ -74,7 +73,7 @@ type toBizConverter interface { //nolint:unused // used by generator // goverter:enum:unknown UserStatusUnspecified // goverter:enum:map StatusActive UserStatusActive // goverter:enum:map StatusBlocked UserStatusBlocked - ToBizPorterStatus(porterinstance.Status) modeltiphereth.UserStatus + ToBizPorterStatus(porterinstance.Status) model.UserStatus ToBizPorterContext(*ent.PorterContext) *modelsupervisor.PorterContext ToBizPorterContextList([]*ent.PorterContext) []*modelsupervisor.PorterContext diff --git a/app/sephirah/internal/data/internal/converter/generated.go b/internal/data/internal/converter/generated.go similarity index 82% rename from app/sephirah/internal/data/internal/converter/generated.go rename to internal/data/internal/converter/generated.go index 9c1d4b1e..078f7eec 100644 --- a/app/sephirah/internal/data/internal/converter/generated.go +++ b/internal/data/internal/converter/generated.go @@ -4,53 +4,51 @@ package converter import ( - ent "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" - appinfo "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - deviceinfo "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - feedconfig "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - image "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - notifyflow "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - notifytarget "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - portercontext "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - porterinstance "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - systemnotification "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" - user "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - modelchesed "github.com/tuihub/librarian/app/sephirah/internal/model/modelchesed" - modelgebura "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - modelnetzach "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - modelsupervisor "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - modeltiphereth "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - modelyesod "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" - libauth "github.com/tuihub/librarian/internal/lib/libauth" + ent "github.com/tuihub/librarian/internal/data/internal/ent" + appinfo "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + deviceinfo "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + feedconfig "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + image "github.com/tuihub/librarian/internal/data/internal/ent/image" + notifyflow "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + notifytarget "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + portercontext "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + porterinstance "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + systemnotification "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" + user "github.com/tuihub/librarian/internal/data/internal/ent/user" model "github.com/tuihub/librarian/internal/model" + modelchesed "github.com/tuihub/librarian/internal/model/modelchesed" modelfeed "github.com/tuihub/librarian/internal/model/modelfeed" + modelgebura "github.com/tuihub/librarian/internal/model/modelgebura" + modelnetzach "github.com/tuihub/librarian/internal/model/modelnetzach" + modelsupervisor "github.com/tuihub/librarian/internal/model/modelsupervisor" + modelyesod "github.com/tuihub/librarian/internal/model/modelyesod" "time" ) -func ToBizAccount(source *ent.Account) *modeltiphereth.Account { - var pModeltipherethAccount *modeltiphereth.Account +func ToBizAccount(source *ent.Account) *model.Account { + var pModelAccount *model.Account if source != nil { - var modeltipherethAccount modeltiphereth.Account - modeltipherethAccount.ID = model.InternalID((*source).ID) - modeltipherethAccount.Platform = (*source).Platform - modeltipherethAccount.PlatformAccountID = (*source).PlatformAccountID - modeltipherethAccount.Name = (*source).Name - modeltipherethAccount.ProfileURL = (*source).ProfileURL - modeltipherethAccount.AvatarURL = (*source).AvatarURL - modeltipherethAccount.LatestUpdateTime = TimeToTime((*source).UpdatedAt) - pModeltipherethAccount = &modeltipherethAccount - } - return pModeltipherethAccount -} -func ToBizAccountList(source []*ent.Account) []*modeltiphereth.Account { - var pModeltipherethAccountList []*modeltiphereth.Account + var modelAccount model.Account + modelAccount.ID = model.InternalID((*source).ID) + modelAccount.Platform = (*source).Platform + modelAccount.PlatformAccountID = (*source).PlatformAccountID + modelAccount.Name = (*source).Name + modelAccount.ProfileURL = (*source).ProfileURL + modelAccount.AvatarURL = (*source).AvatarURL + modelAccount.LatestUpdateTime = TimeToTime((*source).UpdatedAt) + pModelAccount = &modelAccount + } + return pModelAccount +} +func ToBizAccountList(source []*ent.Account) []*model.Account { + var pModelAccountList []*model.Account if source != nil { - pModeltipherethAccountList = make([]*modeltiphereth.Account, len(source)) + pModelAccountList = make([]*model.Account, len(source)) for i := 0; i < len(source); i++ { - pModeltipherethAccountList[i] = ToBizAccount(source[i]) + pModelAccountList[i] = ToBizAccount(source[i]) } } - return pModeltipherethAccountList + return pModelAccountList } func ToBizApp(source *ent.App) *modelgebura.App { var pModelgeburaApp *modelgebura.App @@ -152,30 +150,30 @@ func ToBizAppType(source appinfo.Type) modelgebura.AppType { } return modelgeburaAppType } -func ToBizDeviceInfo(source *ent.DeviceInfo) *modeltiphereth.DeviceInfo { - var pModeltipherethDeviceInfo *modeltiphereth.DeviceInfo +func ToBizDeviceInfo(source *ent.DeviceInfo) *model.DeviceInfo { + var pModelDeviceInfo *model.DeviceInfo if source != nil { - var modeltipherethDeviceInfo modeltiphereth.DeviceInfo - modeltipherethDeviceInfo.ID = modelInternalIDToModelInternalID((*source).ID) - modeltipherethDeviceInfo.DeviceName = (*source).DeviceName - modeltipherethDeviceInfo.SystemType = ToBizSystemType((*source).SystemType) - modeltipherethDeviceInfo.SystemVersion = (*source).SystemVersion - modeltipherethDeviceInfo.ClientName = (*source).ClientName - modeltipherethDeviceInfo.ClientSourceCodeAddress = (*source).ClientSourceCodeAddress - modeltipherethDeviceInfo.ClientVersion = (*source).ClientVersion - pModeltipherethDeviceInfo = &modeltipherethDeviceInfo - } - return pModeltipherethDeviceInfo -} -func ToBizDeviceInfoList(source []*ent.DeviceInfo) []*modeltiphereth.DeviceInfo { - var pModeltipherethDeviceInfoList []*modeltiphereth.DeviceInfo + var modelDeviceInfo model.DeviceInfo + modelDeviceInfo.ID = modelInternalIDToModelInternalID((*source).ID) + modelDeviceInfo.DeviceName = (*source).DeviceName + modelDeviceInfo.SystemType = ToBizSystemType((*source).SystemType) + modelDeviceInfo.SystemVersion = (*source).SystemVersion + modelDeviceInfo.ClientName = (*source).ClientName + modelDeviceInfo.ClientSourceCodeAddress = (*source).ClientSourceCodeAddress + modelDeviceInfo.ClientVersion = (*source).ClientVersion + pModelDeviceInfo = &modelDeviceInfo + } + return pModelDeviceInfo +} +func ToBizDeviceInfoList(source []*ent.DeviceInfo) []*model.DeviceInfo { + var pModelDeviceInfoList []*model.DeviceInfo if source != nil { - pModeltipherethDeviceInfoList = make([]*modeltiphereth.DeviceInfo, len(source)) + pModelDeviceInfoList = make([]*model.DeviceInfo, len(source)) for i := 0; i < len(source); i++ { - pModeltipherethDeviceInfoList[i] = ToBizDeviceInfo(source[i]) + pModelDeviceInfoList[i] = ToBizDeviceInfo(source[i]) } } - return pModeltipherethDeviceInfoList + return pModelDeviceInfoList } func ToBizFeed(source *ent.Feed) *modelfeed.Feed { var pModelfeedFeed *modelfeed.Feed @@ -507,17 +505,17 @@ func ToBizPorterList(source []*ent.PorterInstance) []*modelsupervisor.PorterInst } return pModelsupervisorPorterInstanceList } -func ToBizPorterStatus(source porterinstance.Status) modeltiphereth.UserStatus { - var modeltipherethUserStatus modeltiphereth.UserStatus +func ToBizPorterStatus(source porterinstance.Status) model.UserStatus { + var modelUserStatus model.UserStatus switch source { case porterinstance.StatusActive: - modeltipherethUserStatus = modeltiphereth.UserStatusActive + modelUserStatus = model.UserStatusActive case porterinstance.StatusBlocked: - modeltipherethUserStatus = modeltiphereth.UserStatusBlocked + modelUserStatus = model.UserStatusBlocked default: - modeltipherethUserStatus = modeltiphereth.UserStatusUnspecified + modelUserStatus = model.UserStatusUnspecified } - return modeltipherethUserStatus + return modelUserStatus } func ToBizSystemNotification(source *ent.SystemNotification) *modelnetzach.SystemNotification { var pModelnetzachSystemNotification *modelnetzach.SystemNotification @@ -587,98 +585,98 @@ func ToBizSystemNotificationType(source systemnotification.Type) modelnetzach.Sy } return modelnetzachSystemNotificationType } -func ToBizSystemType(source deviceinfo.SystemType) modeltiphereth.SystemType { - var modeltipherethSystemType modeltiphereth.SystemType +func ToBizSystemType(source deviceinfo.SystemType) model.SystemType { + var modelSystemType model.SystemType switch source { case deviceinfo.SystemTypeAndroid: - modeltipherethSystemType = modeltiphereth.SystemTypeAndroid + modelSystemType = model.SystemTypeAndroid case deviceinfo.SystemTypeIos: - modeltipherethSystemType = modeltiphereth.SystemTypeIOS + modelSystemType = model.SystemTypeIOS case deviceinfo.SystemTypeLinux: - modeltipherethSystemType = modeltiphereth.SystemTypeLinux + modelSystemType = model.SystemTypeLinux case deviceinfo.SystemTypeMacos: - modeltipherethSystemType = modeltiphereth.SystemTypeMacOS + modelSystemType = model.SystemTypeMacOS case deviceinfo.SystemTypeUnknown: - modeltipherethSystemType = modeltiphereth.SystemTypeUnspecified + modelSystemType = model.SystemTypeUnspecified case deviceinfo.SystemTypeWeb: - modeltipherethSystemType = modeltiphereth.SystemTypeWeb + modelSystemType = model.SystemTypeWeb case deviceinfo.SystemTypeWindows: - modeltipherethSystemType = modeltiphereth.SystemTypeWindows + modelSystemType = model.SystemTypeWindows default: - modeltipherethSystemType = modeltiphereth.SystemTypeUnspecified + modelSystemType = model.SystemTypeUnspecified } - return modeltipherethSystemType + return modelSystemType } -func ToBizUser(source *ent.User) *modeltiphereth.User { - var pModeltipherethUser *modeltiphereth.User +func ToBizUser(source *ent.User) *model.User { + var pModelUser *model.User if source != nil { - var modeltipherethUser modeltiphereth.User - modeltipherethUser.ID = modelInternalIDToModelInternalID((*source).ID) - modeltipherethUser.UserName = (*source).Username - modeltipherethUser.Type = ToLibAuthUserType((*source).Type) - modeltipherethUser.Status = ToBizUserStatus((*source).Status) - pModeltipherethUser = &modeltipherethUser + var modelUser model.User + modelUser.ID = modelInternalIDToModelInternalID((*source).ID) + modelUser.Username = (*source).Username + modelUser.Type = ToLibAuthUserType((*source).Type) + modelUser.Status = ToBizUserStatus((*source).Status) + pModelUser = &modelUser } - return pModeltipherethUser + return pModelUser } -func ToBizUserList(source []*ent.User) []*modeltiphereth.User { - var pModeltipherethUserList []*modeltiphereth.User +func ToBizUserList(source []*ent.User) []*model.User { + var pModelUserList []*model.User if source != nil { - pModeltipherethUserList = make([]*modeltiphereth.User, len(source)) + pModelUserList = make([]*model.User, len(source)) for i := 0; i < len(source); i++ { - pModeltipherethUserList[i] = ToBizUser(source[i]) + pModelUserList[i] = ToBizUser(source[i]) } } - return pModeltipherethUserList + return pModelUserList } -func ToBizUserSession(source *ent.UserSession) *modeltiphereth.UserSession { - var pModeltipherethUserSession *modeltiphereth.UserSession +func ToBizUserSession(source *ent.UserSession) *model.UserSession { + var pModelUserSession *model.UserSession if source != nil { - var modeltipherethUserSession modeltiphereth.UserSession - modeltipherethUserSession.ID = modelInternalIDToModelInternalID((*source).ID) - modeltipherethUserSession.UserID = modelInternalIDToModelInternalID((*source).UserID) - modeltipherethUserSession.RefreshToken = (*source).RefreshToken - modeltipherethUserSession.CreateAt = TimeToTime((*source).CreatedAt) - modeltipherethUserSession.ExpireAt = TimeToTime((*source).ExpireAt) - pModeltipherethUserSession = &modeltipherethUserSession - } - return pModeltipherethUserSession -} -func ToBizUserSessionList(source []*ent.UserSession) []*modeltiphereth.UserSession { - var pModeltipherethUserSessionList []*modeltiphereth.UserSession + var modelUserSession model.UserSession + modelUserSession.ID = modelInternalIDToModelInternalID((*source).ID) + modelUserSession.UserID = modelInternalIDToModelInternalID((*source).UserID) + modelUserSession.RefreshToken = (*source).RefreshToken + modelUserSession.CreateAt = TimeToTime((*source).CreatedAt) + modelUserSession.ExpireAt = TimeToTime((*source).ExpireAt) + pModelUserSession = &modelUserSession + } + return pModelUserSession +} +func ToBizUserSessionList(source []*ent.UserSession) []*model.UserSession { + var pModelUserSessionList []*model.UserSession if source != nil { - pModeltipherethUserSessionList = make([]*modeltiphereth.UserSession, len(source)) + pModelUserSessionList = make([]*model.UserSession, len(source)) for i := 0; i < len(source); i++ { - pModeltipherethUserSessionList[i] = ToBizUserSession(source[i]) + pModelUserSessionList[i] = ToBizUserSession(source[i]) } } - return pModeltipherethUserSessionList + return pModelUserSessionList } -func ToBizUserStatus(source user.Status) modeltiphereth.UserStatus { - var modeltipherethUserStatus modeltiphereth.UserStatus +func ToBizUserStatus(source user.Status) model.UserStatus { + var modelUserStatus model.UserStatus switch source { case user.StatusActive: - modeltipherethUserStatus = modeltiphereth.UserStatusActive + modelUserStatus = model.UserStatusActive case user.StatusBlocked: - modeltipherethUserStatus = modeltiphereth.UserStatusBlocked + modelUserStatus = model.UserStatusBlocked default: - modeltipherethUserStatus = modeltiphereth.UserStatusUnspecified + modelUserStatus = model.UserStatusUnspecified } - return modeltipherethUserStatus + return modelUserStatus } -func ToLibAuthUserType(source user.Type) libauth.UserType { - var libauthUserType libauth.UserType +func ToLibAuthUserType(source user.Type) model.UserType { + var modelUserType model.UserType switch source { case user.TypeAdmin: - libauthUserType = libauth.UserTypeAdmin + modelUserType = model.UserTypeAdmin case user.TypeNormal: - libauthUserType = libauth.UserTypeNormal + modelUserType = model.UserTypeNormal case user.TypeSentinel: - libauthUserType = libauth.UserTypeSentinel + modelUserType = model.UserTypeSentinel default: - libauthUserType = libauth.UserTypeUnspecified + modelUserType = model.UserTypeUnspecified } - return libauthUserType + return modelUserType } func entAppInfoToPModelgeburaAppInfoDetails(source ent.AppInfo) *modelgebura.AppInfoDetails { var modelgeburaAppInfoDetails modelgebura.AppInfoDetails @@ -972,19 +970,19 @@ func ToEntPorterContextStatus(source modelsupervisor.PorterContextStatus) porter } return portercontextStatus } -func ToEntPorterInstanceStatus(source modeltiphereth.UserStatus) porterinstance.Status { +func ToEntPorterInstanceStatus(source model.UserStatus) porterinstance.Status { var porterinstanceStatus porterinstance.Status switch source { - case modeltiphereth.UserStatusActive: + case model.UserStatusActive: porterinstanceStatus = porterinstance.StatusActive - case modeltiphereth.UserStatusBlocked: + case model.UserStatusBlocked: porterinstanceStatus = porterinstance.StatusBlocked - case modeltiphereth.UserStatusUnspecified: // ignored + case model.UserStatusUnspecified: // ignored default: // ignored } return porterinstanceStatus } -func ToEntPorterInstanceStatusList(source []modeltiphereth.UserStatus) []porterinstance.Status { +func ToEntPorterInstanceStatusList(source []model.UserStatus) []porterinstance.Status { var porterinstanceStatusList []porterinstance.Status if source != nil { porterinstanceStatusList = make([]porterinstance.Status, len(source)) @@ -1066,39 +1064,39 @@ func ToEntSystemNotificationTypeList(source []modelnetzach.SystemNotificationTyp } return systemnotificationTypeList } -func ToEntSystemType(source modeltiphereth.SystemType) deviceinfo.SystemType { +func ToEntSystemType(source model.SystemType) deviceinfo.SystemType { var deviceinfoSystemType deviceinfo.SystemType switch source { - case modeltiphereth.SystemTypeAndroid: + case model.SystemTypeAndroid: deviceinfoSystemType = deviceinfo.SystemTypeAndroid - case modeltiphereth.SystemTypeIOS: + case model.SystemTypeIOS: deviceinfoSystemType = deviceinfo.SystemTypeIos - case modeltiphereth.SystemTypeLinux: + case model.SystemTypeLinux: deviceinfoSystemType = deviceinfo.SystemTypeLinux - case modeltiphereth.SystemTypeMacOS: + case model.SystemTypeMacOS: deviceinfoSystemType = deviceinfo.SystemTypeMacos - case modeltiphereth.SystemTypeUnspecified: // ignored - case modeltiphereth.SystemTypeWeb: + case model.SystemTypeUnspecified: // ignored + case model.SystemTypeWeb: deviceinfoSystemType = deviceinfo.SystemTypeWeb - case modeltiphereth.SystemTypeWindows: + case model.SystemTypeWindows: deviceinfoSystemType = deviceinfo.SystemTypeWindows default: // ignored } return deviceinfoSystemType } -func ToEntUserStatus(source modeltiphereth.UserStatus) user.Status { +func ToEntUserStatus(source model.UserStatus) user.Status { var userStatus user.Status switch source { - case modeltiphereth.UserStatusActive: + case model.UserStatusActive: userStatus = user.StatusActive - case modeltiphereth.UserStatusBlocked: + case model.UserStatusBlocked: userStatus = user.StatusBlocked - case modeltiphereth.UserStatusUnspecified: // ignored + case model.UserStatusUnspecified: // ignored default: // ignored } return userStatus } -func ToEntUserStatusList(source []modeltiphereth.UserStatus) []user.Status { +func ToEntUserStatusList(source []model.UserStatus) []user.Status { var userStatusList []user.Status if source != nil { userStatusList = make([]user.Status, len(source)) @@ -1108,22 +1106,22 @@ func ToEntUserStatusList(source []modeltiphereth.UserStatus) []user.Status { } return userStatusList } -func ToEntUserType(source libauth.UserType) user.Type { +func ToEntUserType(source model.UserType) user.Type { var userType user.Type switch source { - case libauth.UserTypeAdmin: + case model.UserTypeAdmin: userType = user.TypeAdmin - case libauth.UserTypeNormal: + case model.UserTypeNormal: userType = user.TypeNormal - case libauth.UserTypePorter: // ignored - case libauth.UserTypeSentinel: + case model.UserTypePorter: // ignored + case model.UserTypeSentinel: userType = user.TypeSentinel - case libauth.UserTypeUnspecified: // ignored + case model.UserTypeUnspecified: // ignored default: // ignored } return userType } -func ToEntUserTypeList(source []libauth.UserType) []user.Type { +func ToEntUserTypeList(source []model.UserType) []user.Type { var userTypeList []user.Type if source != nil { userTypeList = make([]user.Type, len(source)) diff --git a/app/sephirah/internal/data/internal/ent/account.go b/internal/data/internal/ent/account.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/account.go rename to internal/data/internal/ent/account.go index 2838f145..c08a2b99 100644 --- a/app/sephirah/internal/data/internal/ent/account.go +++ b/internal/data/internal/ent/account.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/account/account.go b/internal/data/internal/ent/account/account.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/account/account.go rename to internal/data/internal/ent/account/account.go diff --git a/app/sephirah/internal/data/internal/ent/account/where.go b/internal/data/internal/ent/account/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/account/where.go rename to internal/data/internal/ent/account/where.go index 0a0cf7fa..e456bf09 100644 --- a/app/sephirah/internal/data/internal/ent/account/where.go +++ b/internal/data/internal/ent/account/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/account_create.go b/internal/data/internal/ent/account_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/account_create.go rename to internal/data/internal/ent/account_create.go index a9cbb1c5..74531bef 100644 --- a/app/sephirah/internal/data/internal/ent/account_create.go +++ b/internal/data/internal/ent/account_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/account_delete.go b/internal/data/internal/ent/account_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/account_delete.go rename to internal/data/internal/ent/account_delete.go index 733aef55..bbbe77c8 100644 --- a/app/sephirah/internal/data/internal/ent/account_delete.go +++ b/internal/data/internal/ent/account_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // AccountDelete is the builder for deleting a Account entity. diff --git a/app/sephirah/internal/data/internal/ent/account_query.go b/internal/data/internal/ent/account_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/account_query.go rename to internal/data/internal/ent/account_query.go index c21c573c..c64d963e 100644 --- a/app/sephirah/internal/data/internal/ent/account_query.go +++ b/internal/data/internal/ent/account_query.go @@ -12,10 +12,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/account_update.go b/internal/data/internal/ent/account_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/account_update.go rename to internal/data/internal/ent/account_update.go index 0d2fdd26..ef0d7d15 100644 --- a/app/sephirah/internal/data/internal/ent/account_update.go +++ b/internal/data/internal/ent/account_update.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/app.go b/internal/data/internal/ent/app.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/app.go rename to internal/data/internal/ent/app.go index 16670312..289a8c18 100644 --- a/app/sephirah/internal/data/internal/ent/app.go +++ b/internal/data/internal/ent/app.go @@ -9,9 +9,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/app/app.go b/internal/data/internal/ent/app/app.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/app/app.go rename to internal/data/internal/ent/app/app.go diff --git a/app/sephirah/internal/data/internal/ent/app/where.go b/internal/data/internal/ent/app/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/app/where.go rename to internal/data/internal/ent/app/where.go index 8cb5ab60..7be1c71d 100644 --- a/app/sephirah/internal/data/internal/ent/app/where.go +++ b/internal/data/internal/ent/app/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/app_create.go b/internal/data/internal/ent/app_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/app_create.go rename to internal/data/internal/ent/app_create.go index ecec294c..bbfd9f48 100644 --- a/app/sephirah/internal/data/internal/ent/app_create.go +++ b/internal/data/internal/ent/app_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/app_delete.go b/internal/data/internal/ent/app_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/app_delete.go rename to internal/data/internal/ent/app_delete.go index 7539d84a..bb623570 100644 --- a/app/sephirah/internal/data/internal/ent/app_delete.go +++ b/internal/data/internal/ent/app_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // AppDelete is the builder for deleting a App entity. diff --git a/app/sephirah/internal/data/internal/ent/app_query.go b/internal/data/internal/ent/app_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/app_query.go rename to internal/data/internal/ent/app_query.go index 6de48220..f1742392 100644 --- a/app/sephirah/internal/data/internal/ent/app_query.go +++ b/internal/data/internal/ent/app_query.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/app_update.go b/internal/data/internal/ent/app_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/app_update.go rename to internal/data/internal/ent/app_update.go index e13c5a7b..e6b14b2c 100644 --- a/app/sephirah/internal/data/internal/ent/app_update.go +++ b/internal/data/internal/ent/app_update.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appbinary.go b/internal/data/internal/ent/appbinary.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/appbinary.go rename to internal/data/internal/ent/appbinary.go index efe7e4c8..6206b886 100644 --- a/app/sephirah/internal/data/internal/ent/appbinary.go +++ b/internal/data/internal/ent/appbinary.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appbinary/appbinary.go b/internal/data/internal/ent/appbinary/appbinary.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/appbinary/appbinary.go rename to internal/data/internal/ent/appbinary/appbinary.go diff --git a/app/sephirah/internal/data/internal/ent/appbinary/where.go b/internal/data/internal/ent/appbinary/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/appbinary/where.go rename to internal/data/internal/ent/appbinary/where.go index fe60fefb..f718d8cc 100644 --- a/app/sephirah/internal/data/internal/ent/appbinary/where.go +++ b/internal/data/internal/ent/appbinary/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appbinary_create.go b/internal/data/internal/ent/appbinary_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/appbinary_create.go rename to internal/data/internal/ent/appbinary_create.go index 77f39ebd..625fc097 100644 --- a/app/sephirah/internal/data/internal/ent/appbinary_create.go +++ b/internal/data/internal/ent/appbinary_create.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appbinary_delete.go b/internal/data/internal/ent/appbinary_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/appbinary_delete.go rename to internal/data/internal/ent/appbinary_delete.go index 6c0e0eda..efb3230c 100644 --- a/app/sephirah/internal/data/internal/ent/appbinary_delete.go +++ b/internal/data/internal/ent/appbinary_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // AppBinaryDelete is the builder for deleting a AppBinary entity. diff --git a/app/sephirah/internal/data/internal/ent/appbinary_query.go b/internal/data/internal/ent/appbinary_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/appbinary_query.go rename to internal/data/internal/ent/appbinary_query.go index 7a3a4797..44362aaa 100644 --- a/app/sephirah/internal/data/internal/ent/appbinary_query.go +++ b/internal/data/internal/ent/appbinary_query.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appbinary_update.go b/internal/data/internal/ent/appbinary_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/appbinary_update.go rename to internal/data/internal/ent/appbinary_update.go index 10df580f..3b86216f 100644 --- a/app/sephirah/internal/data/internal/ent/appbinary_update.go +++ b/internal/data/internal/ent/appbinary_update.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinfo.go b/internal/data/internal/ent/appinfo.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/appinfo.go rename to internal/data/internal/ent/appinfo.go index 2755c660..c26ca3a4 100644 --- a/app/sephirah/internal/data/internal/ent/appinfo.go +++ b/internal/data/internal/ent/appinfo.go @@ -9,7 +9,7 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinfo/appinfo.go b/internal/data/internal/ent/appinfo/appinfo.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/appinfo/appinfo.go rename to internal/data/internal/ent/appinfo/appinfo.go diff --git a/app/sephirah/internal/data/internal/ent/appinfo/where.go b/internal/data/internal/ent/appinfo/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/appinfo/where.go rename to internal/data/internal/ent/appinfo/where.go index 659eaa45..0e044420 100644 --- a/app/sephirah/internal/data/internal/ent/appinfo/where.go +++ b/internal/data/internal/ent/appinfo/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinfo_create.go b/internal/data/internal/ent/appinfo_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/appinfo_create.go rename to internal/data/internal/ent/appinfo_create.go index f1cec963..97e8474a 100644 --- a/app/sephirah/internal/data/internal/ent/appinfo_create.go +++ b/internal/data/internal/ent/appinfo_create.go @@ -11,11 +11,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinfo_delete.go b/internal/data/internal/ent/appinfo_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/appinfo_delete.go rename to internal/data/internal/ent/appinfo_delete.go index b7d20976..f1b79baa 100644 --- a/app/sephirah/internal/data/internal/ent/appinfo_delete.go +++ b/internal/data/internal/ent/appinfo_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // AppInfoDelete is the builder for deleting a AppInfo entity. diff --git a/app/sephirah/internal/data/internal/ent/appinfo_query.go b/internal/data/internal/ent/appinfo_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/appinfo_query.go rename to internal/data/internal/ent/appinfo_query.go index 2aaac56b..b3a13394 100644 --- a/app/sephirah/internal/data/internal/ent/appinfo_query.go +++ b/internal/data/internal/ent/appinfo_query.go @@ -12,12 +12,12 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinfo_update.go b/internal/data/internal/ent/appinfo_update.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/appinfo_update.go rename to internal/data/internal/ent/appinfo_update.go index 9ebeae3f..25f8b35a 100644 --- a/app/sephirah/internal/data/internal/ent/appinfo_update.go +++ b/internal/data/internal/ent/appinfo_update.go @@ -11,12 +11,12 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinst.go b/internal/data/internal/ent/appinst.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/appinst.go rename to internal/data/internal/ent/appinst.go index 05eacb9a..28370e09 100644 --- a/app/sephirah/internal/data/internal/ent/appinst.go +++ b/internal/data/internal/ent/appinst.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinst/appinst.go b/internal/data/internal/ent/appinst/appinst.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/appinst/appinst.go rename to internal/data/internal/ent/appinst/appinst.go diff --git a/app/sephirah/internal/data/internal/ent/appinst/where.go b/internal/data/internal/ent/appinst/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/appinst/where.go rename to internal/data/internal/ent/appinst/where.go index ef18eabf..dc6904ff 100644 --- a/app/sephirah/internal/data/internal/ent/appinst/where.go +++ b/internal/data/internal/ent/appinst/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinst_create.go b/internal/data/internal/ent/appinst_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/appinst_create.go rename to internal/data/internal/ent/appinst_create.go index 154d662a..64cca893 100644 --- a/app/sephirah/internal/data/internal/ent/appinst_create.go +++ b/internal/data/internal/ent/appinst_create.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinst_delete.go b/internal/data/internal/ent/appinst_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/appinst_delete.go rename to internal/data/internal/ent/appinst_delete.go index 3f5959ff..023b7c4b 100644 --- a/app/sephirah/internal/data/internal/ent/appinst_delete.go +++ b/internal/data/internal/ent/appinst_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // AppInstDelete is the builder for deleting a AppInst entity. diff --git a/app/sephirah/internal/data/internal/ent/appinst_query.go b/internal/data/internal/ent/appinst_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/appinst_query.go rename to internal/data/internal/ent/appinst_query.go index 65e0a524..75b37139 100644 --- a/app/sephirah/internal/data/internal/ent/appinst_query.go +++ b/internal/data/internal/ent/appinst_query.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinst_update.go b/internal/data/internal/ent/appinst_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/appinst_update.go rename to internal/data/internal/ent/appinst_update.go index 9522dab0..c59291cf 100644 --- a/app/sephirah/internal/data/internal/ent/appinst_update.go +++ b/internal/data/internal/ent/appinst_update.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinstruntime.go b/internal/data/internal/ent/appinstruntime.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/appinstruntime.go rename to internal/data/internal/ent/appinstruntime.go index fdc43ce2..e2d36b56 100644 --- a/app/sephirah/internal/data/internal/ent/appinstruntime.go +++ b/internal/data/internal/ent/appinstruntime.go @@ -9,7 +9,7 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinstruntime" + "github.com/tuihub/librarian/internal/data/internal/ent/appinstruntime" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinstruntime/appinstruntime.go b/internal/data/internal/ent/appinstruntime/appinstruntime.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/appinstruntime/appinstruntime.go rename to internal/data/internal/ent/appinstruntime/appinstruntime.go diff --git a/app/sephirah/internal/data/internal/ent/appinstruntime/where.go b/internal/data/internal/ent/appinstruntime/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/appinstruntime/where.go rename to internal/data/internal/ent/appinstruntime/where.go index 89547c68..eee7f462 100644 --- a/app/sephirah/internal/data/internal/ent/appinstruntime/where.go +++ b/internal/data/internal/ent/appinstruntime/where.go @@ -6,7 +6,7 @@ import ( "time" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinstruntime_create.go b/internal/data/internal/ent/appinstruntime_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/appinstruntime_create.go rename to internal/data/internal/ent/appinstruntime_create.go index 2e588584..37a9c14d 100644 --- a/app/sephirah/internal/data/internal/ent/appinstruntime_create.go +++ b/internal/data/internal/ent/appinstruntime_create.go @@ -11,7 +11,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinstruntime" + "github.com/tuihub/librarian/internal/data/internal/ent/appinstruntime" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/appinstruntime_delete.go b/internal/data/internal/ent/appinstruntime_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/appinstruntime_delete.go rename to internal/data/internal/ent/appinstruntime_delete.go index 5c8ea5fd..6da19763 100644 --- a/app/sephirah/internal/data/internal/ent/appinstruntime_delete.go +++ b/internal/data/internal/ent/appinstruntime_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinstruntime" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/appinstruntime" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // AppInstRunTimeDelete is the builder for deleting a AppInstRunTime entity. diff --git a/app/sephirah/internal/data/internal/ent/appinstruntime_query.go b/internal/data/internal/ent/appinstruntime_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/appinstruntime_query.go rename to internal/data/internal/ent/appinstruntime_query.go index c40c8380..29b79b7a 100644 --- a/app/sephirah/internal/data/internal/ent/appinstruntime_query.go +++ b/internal/data/internal/ent/appinstruntime_query.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinstruntime" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/appinstruntime" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // AppInstRunTimeQuery is the builder for querying AppInstRunTime entities. diff --git a/app/sephirah/internal/data/internal/ent/appinstruntime_update.go b/internal/data/internal/ent/appinstruntime_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/appinstruntime_update.go rename to internal/data/internal/ent/appinstruntime_update.go index e172704e..99dd9724 100644 --- a/app/sephirah/internal/data/internal/ent/appinstruntime_update.go +++ b/internal/data/internal/ent/appinstruntime_update.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinstruntime" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/appinstruntime" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/client.go b/internal/data/internal/ent/client.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/client.go rename to internal/data/internal/ent/client.go index cba2bdb9..a4bf5b2f 100644 --- a/app/sephirah/internal/data/internal/ent/client.go +++ b/internal/data/internal/ent/client.go @@ -9,40 +9,40 @@ import ( "log" "reflect" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/migrate" + "github.com/tuihub/librarian/internal/data/internal/ent/migrate" "github.com/tuihub/librarian/internal/model" "entgo.io/ent" "entgo.io/ent/dialect" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinstruntime" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/appinstruntime" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" ) // Client is the client that holds all ent builders. diff --git a/app/sephirah/internal/data/internal/ent/deviceinfo.go b/internal/data/internal/ent/deviceinfo.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/deviceinfo.go rename to internal/data/internal/ent/deviceinfo.go index e0079b13..7fae8518 100644 --- a/app/sephirah/internal/data/internal/ent/deviceinfo.go +++ b/internal/data/internal/ent/deviceinfo.go @@ -9,7 +9,7 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/deviceinfo/deviceinfo.go b/internal/data/internal/ent/deviceinfo/deviceinfo.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/deviceinfo/deviceinfo.go rename to internal/data/internal/ent/deviceinfo/deviceinfo.go diff --git a/app/sephirah/internal/data/internal/ent/deviceinfo/where.go b/internal/data/internal/ent/deviceinfo/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/deviceinfo/where.go rename to internal/data/internal/ent/deviceinfo/where.go index c8aeaf0b..011c12f4 100644 --- a/app/sephirah/internal/data/internal/ent/deviceinfo/where.go +++ b/internal/data/internal/ent/deviceinfo/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/deviceinfo_create.go b/internal/data/internal/ent/deviceinfo_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/deviceinfo_create.go rename to internal/data/internal/ent/deviceinfo_create.go index 76048d10..18b566d6 100644 --- a/app/sephirah/internal/data/internal/ent/deviceinfo_create.go +++ b/internal/data/internal/ent/deviceinfo_create.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/deviceinfo_delete.go b/internal/data/internal/ent/deviceinfo_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/deviceinfo_delete.go rename to internal/data/internal/ent/deviceinfo_delete.go index 9bf65281..8227b11c 100644 --- a/app/sephirah/internal/data/internal/ent/deviceinfo_delete.go +++ b/internal/data/internal/ent/deviceinfo_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // DeviceInfoDelete is the builder for deleting a DeviceInfo entity. diff --git a/app/sephirah/internal/data/internal/ent/deviceinfo_query.go b/internal/data/internal/ent/deviceinfo_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/deviceinfo_query.go rename to internal/data/internal/ent/deviceinfo_query.go index 7916bc0b..cdeef38d 100644 --- a/app/sephirah/internal/data/internal/ent/deviceinfo_query.go +++ b/internal/data/internal/ent/deviceinfo_query.go @@ -12,11 +12,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/deviceinfo_update.go b/internal/data/internal/ent/deviceinfo_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/deviceinfo_update.go rename to internal/data/internal/ent/deviceinfo_update.go index 6a920ed0..3b9abc7a 100644 --- a/app/sephirah/internal/data/internal/ent/deviceinfo_update.go +++ b/internal/data/internal/ent/deviceinfo_update.go @@ -11,11 +11,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/ent.go b/internal/data/internal/ent/ent.go similarity index 88% rename from app/sephirah/internal/data/internal/ent/ent.go rename to internal/data/internal/ent/ent.go index ac00c218..d34532ec 100644 --- a/app/sephirah/internal/data/internal/ent/ent.go +++ b/internal/data/internal/ent/ent.go @@ -12,33 +12,33 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinstruntime" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/appinstruntime" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" ) // ent aliases to avoid import conflicts in user's code. diff --git a/app/sephirah/internal/data/internal/ent/enttest/enttest.go b/internal/data/internal/ent/enttest/enttest.go similarity index 88% rename from app/sephirah/internal/data/internal/ent/enttest/enttest.go rename to internal/data/internal/ent/enttest/enttest.go index 4743b0d7..d2c82e96 100644 --- a/app/sephirah/internal/data/internal/ent/enttest/enttest.go +++ b/internal/data/internal/ent/enttest/enttest.go @@ -5,12 +5,12 @@ package enttest import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/data/internal/ent" // required by schema hooks. - _ "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/runtime" + _ "github.com/tuihub/librarian/internal/data/internal/ent/runtime" "entgo.io/ent/dialect/sql/schema" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/migrate" + "github.com/tuihub/librarian/internal/data/internal/ent/migrate" ) type ( diff --git a/app/sephirah/internal/data/internal/ent/feed.go b/internal/data/internal/ent/feed.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feed.go rename to internal/data/internal/ent/feed.go index 33a3b42d..007b1b2b 100644 --- a/app/sephirah/internal/data/internal/ent/feed.go +++ b/internal/data/internal/ent/feed.go @@ -10,8 +10,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" ) diff --git a/app/sephirah/internal/data/internal/ent/feed/feed.go b/internal/data/internal/ent/feed/feed.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/feed/feed.go rename to internal/data/internal/ent/feed/feed.go diff --git a/app/sephirah/internal/data/internal/ent/feed/where.go b/internal/data/internal/ent/feed/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/feed/where.go rename to internal/data/internal/ent/feed/where.go index b870e8be..6ef0e962 100644 --- a/app/sephirah/internal/data/internal/ent/feed/where.go +++ b/internal/data/internal/ent/feed/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feed_create.go b/internal/data/internal/ent/feed_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/feed_create.go rename to internal/data/internal/ent/feed_create.go index 201bd9fb..3be2439d 100644 --- a/app/sephirah/internal/data/internal/ent/feed_create.go +++ b/internal/data/internal/ent/feed_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" ) diff --git a/app/sephirah/internal/data/internal/ent/feed_delete.go b/internal/data/internal/ent/feed_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/feed_delete.go rename to internal/data/internal/ent/feed_delete.go index 1121936b..4aafd65f 100644 --- a/app/sephirah/internal/data/internal/ent/feed_delete.go +++ b/internal/data/internal/ent/feed_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // FeedDelete is the builder for deleting a Feed entity. diff --git a/app/sephirah/internal/data/internal/ent/feed_query.go b/internal/data/internal/ent/feed_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feed_query.go rename to internal/data/internal/ent/feed_query.go index 35391e5d..7a48c176 100644 --- a/app/sephirah/internal/data/internal/ent/feed_query.go +++ b/internal/data/internal/ent/feed_query.go @@ -12,10 +12,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feed_update.go b/internal/data/internal/ent/feed_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feed_update.go rename to internal/data/internal/ent/feed_update.go index 89968d5c..976ac2c7 100644 --- a/app/sephirah/internal/data/internal/ent/feed_update.go +++ b/internal/data/internal/ent/feed_update.go @@ -12,10 +12,10 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/dialect/sql/sqljson" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" ) diff --git a/app/sephirah/internal/data/internal/ent/feedactionset.go b/internal/data/internal/ent/feedactionset.go similarity index 96% rename from app/sephirah/internal/data/internal/ent/feedactionset.go rename to internal/data/internal/ent/feedactionset.go index e495e33e..6d411b5f 100644 --- a/app/sephirah/internal/data/internal/ent/feedactionset.go +++ b/internal/data/internal/ent/feedactionset.go @@ -10,10 +10,10 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // FeedActionSet is the model entity for the FeedActionSet schema. diff --git a/app/sephirah/internal/data/internal/ent/feedactionset/feedactionset.go b/internal/data/internal/ent/feedactionset/feedactionset.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/feedactionset/feedactionset.go rename to internal/data/internal/ent/feedactionset/feedactionset.go diff --git a/app/sephirah/internal/data/internal/ent/feedactionset/where.go b/internal/data/internal/ent/feedactionset/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/feedactionset/where.go rename to internal/data/internal/ent/feedactionset/where.go index 24e2aff4..1b9b6add 100644 --- a/app/sephirah/internal/data/internal/ent/feedactionset/where.go +++ b/internal/data/internal/ent/feedactionset/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feedactionset_create.go b/internal/data/internal/ent/feedactionset_create.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feedactionset_create.go rename to internal/data/internal/ent/feedactionset_create.go index 204fe235..9541c214 100644 --- a/app/sephirah/internal/data/internal/ent/feedactionset_create.go +++ b/internal/data/internal/ent/feedactionset_create.go @@ -11,11 +11,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // FeedActionSetCreate is the builder for creating a FeedActionSet entity. diff --git a/app/sephirah/internal/data/internal/ent/feedactionset_delete.go b/internal/data/internal/ent/feedactionset_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/feedactionset_delete.go rename to internal/data/internal/ent/feedactionset_delete.go index 48e96eb2..5147c472 100644 --- a/app/sephirah/internal/data/internal/ent/feedactionset_delete.go +++ b/internal/data/internal/ent/feedactionset_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // FeedActionSetDelete is the builder for deleting a FeedActionSet entity. diff --git a/app/sephirah/internal/data/internal/ent/feedactionset_query.go b/internal/data/internal/ent/feedactionset_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feedactionset_query.go rename to internal/data/internal/ent/feedactionset_query.go index 482ac24d..854ccbf8 100644 --- a/app/sephirah/internal/data/internal/ent/feedactionset_query.go +++ b/internal/data/internal/ent/feedactionset_query.go @@ -12,10 +12,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feedactionset_update.go b/internal/data/internal/ent/feedactionset_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feedactionset_update.go rename to internal/data/internal/ent/feedactionset_update.go index 4134842d..4b041d6f 100644 --- a/app/sephirah/internal/data/internal/ent/feedactionset_update.go +++ b/internal/data/internal/ent/feedactionset_update.go @@ -12,12 +12,12 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/dialect/sql/sqljson" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // FeedActionSetUpdate is the builder for updating FeedActionSet entities. diff --git a/app/sephirah/internal/data/internal/ent/feedconfig.go b/internal/data/internal/ent/feedconfig.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/feedconfig.go rename to internal/data/internal/ent/feedconfig.go index 23b04ab7..6f1aad0e 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfig.go +++ b/internal/data/internal/ent/feedconfig.go @@ -10,11 +10,11 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // FeedConfig is the model entity for the FeedConfig schema. diff --git a/app/sephirah/internal/data/internal/ent/feedconfig/feedconfig.go b/internal/data/internal/ent/feedconfig/feedconfig.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/feedconfig/feedconfig.go rename to internal/data/internal/ent/feedconfig/feedconfig.go diff --git a/app/sephirah/internal/data/internal/ent/feedconfig/where.go b/internal/data/internal/ent/feedconfig/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/feedconfig/where.go rename to internal/data/internal/ent/feedconfig/where.go index 51b3144c..1fea19eb 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfig/where.go +++ b/internal/data/internal/ent/feedconfig/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feedconfig_create.go b/internal/data/internal/ent/feedconfig_create.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feedconfig_create.go rename to internal/data/internal/ent/feedconfig_create.go index 96cb1bc1..1a1558e9 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfig_create.go +++ b/internal/data/internal/ent/feedconfig_create.go @@ -11,14 +11,14 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // FeedConfigCreate is the builder for creating a FeedConfig entity. diff --git a/app/sephirah/internal/data/internal/ent/feedconfig_delete.go b/internal/data/internal/ent/feedconfig_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/feedconfig_delete.go rename to internal/data/internal/ent/feedconfig_delete.go index 9ea88c67..1f8eec23 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfig_delete.go +++ b/internal/data/internal/ent/feedconfig_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // FeedConfigDelete is the builder for deleting a FeedConfig entity. diff --git a/app/sephirah/internal/data/internal/ent/feedconfig_query.go b/internal/data/internal/ent/feedconfig_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feedconfig_query.go rename to internal/data/internal/ent/feedconfig_query.go index 343fdb21..7362454f 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfig_query.go +++ b/internal/data/internal/ent/feedconfig_query.go @@ -12,13 +12,13 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feedconfig_update.go b/internal/data/internal/ent/feedconfig_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feedconfig_update.go rename to internal/data/internal/ent/feedconfig_update.go index 7548f410..f48fe981 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfig_update.go +++ b/internal/data/internal/ent/feedconfig_update.go @@ -11,15 +11,15 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // FeedConfigUpdate is the builder for updating FeedConfig entities. diff --git a/app/sephirah/internal/data/internal/ent/feedconfigaction.go b/internal/data/internal/ent/feedconfigaction.go similarity index 96% rename from app/sephirah/internal/data/internal/ent/feedconfigaction.go rename to internal/data/internal/ent/feedconfigaction.go index ba458388..3abdaf84 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfigaction.go +++ b/internal/data/internal/ent/feedconfigaction.go @@ -9,9 +9,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feedconfigaction/feedconfigaction.go b/internal/data/internal/ent/feedconfigaction/feedconfigaction.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/feedconfigaction/feedconfigaction.go rename to internal/data/internal/ent/feedconfigaction/feedconfigaction.go diff --git a/app/sephirah/internal/data/internal/ent/feedconfigaction/where.go b/internal/data/internal/ent/feedconfigaction/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/feedconfigaction/where.go rename to internal/data/internal/ent/feedconfigaction/where.go index 039e0b7c..0bbc4e2f 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfigaction/where.go +++ b/internal/data/internal/ent/feedconfigaction/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feedconfigaction_create.go b/internal/data/internal/ent/feedconfigaction_create.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feedconfigaction_create.go rename to internal/data/internal/ent/feedconfigaction_create.go index f2af216c..900aab73 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfigaction_create.go +++ b/internal/data/internal/ent/feedconfigaction_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feedconfigaction_delete.go b/internal/data/internal/ent/feedconfigaction_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/feedconfigaction_delete.go rename to internal/data/internal/ent/feedconfigaction_delete.go index 0ec4b7b7..2c8cd786 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfigaction_delete.go +++ b/internal/data/internal/ent/feedconfigaction_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // FeedConfigActionDelete is the builder for deleting a FeedConfigAction entity. diff --git a/app/sephirah/internal/data/internal/ent/feedconfigaction_query.go b/internal/data/internal/ent/feedconfigaction_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feedconfigaction_query.go rename to internal/data/internal/ent/feedconfigaction_query.go index cbc2adf0..1e71cb4e 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfigaction_query.go +++ b/internal/data/internal/ent/feedconfigaction_query.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feedconfigaction_update.go b/internal/data/internal/ent/feedconfigaction_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feedconfigaction_update.go rename to internal/data/internal/ent/feedconfigaction_update.go index 4cffb6fa..eb4925fc 100644 --- a/app/sephirah/internal/data/internal/ent/feedconfigaction_update.go +++ b/internal/data/internal/ent/feedconfigaction_update.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feeditem.go b/internal/data/internal/ent/feeditem.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feeditem.go rename to internal/data/internal/ent/feeditem.go index ab7834cf..c0eeda9b 100644 --- a/app/sephirah/internal/data/internal/ent/feeditem.go +++ b/internal/data/internal/ent/feeditem.go @@ -10,8 +10,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" ) diff --git a/app/sephirah/internal/data/internal/ent/feeditem/feeditem.go b/internal/data/internal/ent/feeditem/feeditem.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/feeditem/feeditem.go rename to internal/data/internal/ent/feeditem/feeditem.go diff --git a/app/sephirah/internal/data/internal/ent/feeditem/where.go b/internal/data/internal/ent/feeditem/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/feeditem/where.go rename to internal/data/internal/ent/feeditem/where.go index dc51e340..9ca90fd9 100644 --- a/app/sephirah/internal/data/internal/ent/feeditem/where.go +++ b/internal/data/internal/ent/feeditem/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feeditem_create.go b/internal/data/internal/ent/feeditem_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/feeditem_create.go rename to internal/data/internal/ent/feeditem_create.go index e4f6c009..f5b618bd 100644 --- a/app/sephirah/internal/data/internal/ent/feeditem_create.go +++ b/internal/data/internal/ent/feeditem_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" ) diff --git a/app/sephirah/internal/data/internal/ent/feeditem_delete.go b/internal/data/internal/ent/feeditem_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/feeditem_delete.go rename to internal/data/internal/ent/feeditem_delete.go index 47dedcaf..43d08c9c 100644 --- a/app/sephirah/internal/data/internal/ent/feeditem_delete.go +++ b/internal/data/internal/ent/feeditem_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // FeedItemDelete is the builder for deleting a FeedItem entity. diff --git a/app/sephirah/internal/data/internal/ent/feeditem_query.go b/internal/data/internal/ent/feeditem_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feeditem_query.go rename to internal/data/internal/ent/feeditem_query.go index 95e18a3a..5fd8bfea 100644 --- a/app/sephirah/internal/data/internal/ent/feeditem_query.go +++ b/internal/data/internal/ent/feeditem_query.go @@ -12,10 +12,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feeditem_update.go b/internal/data/internal/ent/feeditem_update.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/feeditem_update.go rename to internal/data/internal/ent/feeditem_update.go index 79610236..29cd95be 100644 --- a/app/sephirah/internal/data/internal/ent/feeditem_update.go +++ b/internal/data/internal/ent/feeditem_update.go @@ -12,9 +12,9 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/dialect/sql/sqljson" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" ) diff --git a/app/sephirah/internal/data/internal/ent/feeditemcollection.go b/internal/data/internal/ent/feeditemcollection.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feeditemcollection.go rename to internal/data/internal/ent/feeditemcollection.go index fc132406..19906755 100644 --- a/app/sephirah/internal/data/internal/ent/feeditemcollection.go +++ b/internal/data/internal/ent/feeditemcollection.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feeditemcollection/feeditemcollection.go b/internal/data/internal/ent/feeditemcollection/feeditemcollection.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/feeditemcollection/feeditemcollection.go rename to internal/data/internal/ent/feeditemcollection/feeditemcollection.go diff --git a/app/sephirah/internal/data/internal/ent/feeditemcollection/where.go b/internal/data/internal/ent/feeditemcollection/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/feeditemcollection/where.go rename to internal/data/internal/ent/feeditemcollection/where.go index 6a8ebf96..1638d2ab 100644 --- a/app/sephirah/internal/data/internal/ent/feeditemcollection/where.go +++ b/internal/data/internal/ent/feeditemcollection/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feeditemcollection_create.go b/internal/data/internal/ent/feeditemcollection_create.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feeditemcollection_create.go rename to internal/data/internal/ent/feeditemcollection_create.go index 405838b8..0da59e1e 100644 --- a/app/sephirah/internal/data/internal/ent/feeditemcollection_create.go +++ b/internal/data/internal/ent/feeditemcollection_create.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feeditemcollection_delete.go b/internal/data/internal/ent/feeditemcollection_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/feeditemcollection_delete.go rename to internal/data/internal/ent/feeditemcollection_delete.go index 49c46636..9668bfc9 100644 --- a/app/sephirah/internal/data/internal/ent/feeditemcollection_delete.go +++ b/internal/data/internal/ent/feeditemcollection_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // FeedItemCollectionDelete is the builder for deleting a FeedItemCollection entity. diff --git a/app/sephirah/internal/data/internal/ent/feeditemcollection_query.go b/internal/data/internal/ent/feeditemcollection_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feeditemcollection_query.go rename to internal/data/internal/ent/feeditemcollection_query.go index ff56b474..117d2eda 100644 --- a/app/sephirah/internal/data/internal/ent/feeditemcollection_query.go +++ b/internal/data/internal/ent/feeditemcollection_query.go @@ -12,11 +12,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/feeditemcollection_update.go b/internal/data/internal/ent/feeditemcollection_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/feeditemcollection_update.go rename to internal/data/internal/ent/feeditemcollection_update.go index a87ac66e..45528880 100644 --- a/app/sephirah/internal/data/internal/ent/feeditemcollection_update.go +++ b/internal/data/internal/ent/feeditemcollection_update.go @@ -11,11 +11,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/file.go b/internal/data/internal/ent/file.go similarity index 96% rename from app/sephirah/internal/data/internal/ent/file.go rename to internal/data/internal/ent/file.go index 3c5da477..efd13453 100644 --- a/app/sephirah/internal/data/internal/ent/file.go +++ b/internal/data/internal/ent/file.go @@ -9,9 +9,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/file/file.go b/internal/data/internal/ent/file/file.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/file/file.go rename to internal/data/internal/ent/file/file.go diff --git a/app/sephirah/internal/data/internal/ent/file/where.go b/internal/data/internal/ent/file/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/file/where.go rename to internal/data/internal/ent/file/where.go index 75382d69..28d0801f 100644 --- a/app/sephirah/internal/data/internal/ent/file/where.go +++ b/internal/data/internal/ent/file/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/file_create.go b/internal/data/internal/ent/file_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/file_create.go rename to internal/data/internal/ent/file_create.go index fe477f3d..5ba6e1ec 100644 --- a/app/sephirah/internal/data/internal/ent/file_create.go +++ b/internal/data/internal/ent/file_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/file_delete.go b/internal/data/internal/ent/file_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/file_delete.go rename to internal/data/internal/ent/file_delete.go index 1db87008..83b07d63 100644 --- a/app/sephirah/internal/data/internal/ent/file_delete.go +++ b/internal/data/internal/ent/file_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // FileDelete is the builder for deleting a File entity. diff --git a/app/sephirah/internal/data/internal/ent/file_query.go b/internal/data/internal/ent/file_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/file_query.go rename to internal/data/internal/ent/file_query.go index b4fc0bbf..e23890b6 100644 --- a/app/sephirah/internal/data/internal/ent/file_query.go +++ b/internal/data/internal/ent/file_query.go @@ -12,10 +12,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/file_update.go b/internal/data/internal/ent/file_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/file_update.go rename to internal/data/internal/ent/file_update.go index 86be04b9..864ff546 100644 --- a/app/sephirah/internal/data/internal/ent/file_update.go +++ b/internal/data/internal/ent/file_update.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/generate.go b/internal/data/internal/ent/generate.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/generate.go rename to internal/data/internal/ent/generate.go diff --git a/app/sephirah/internal/data/internal/ent/hook/hook.go b/internal/data/internal/ent/hook/hook.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/hook/hook.go rename to internal/data/internal/ent/hook/hook.go index c7dfed22..41399393 100644 --- a/app/sephirah/internal/data/internal/ent/hook/hook.go +++ b/internal/data/internal/ent/hook/hook.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/data/internal/ent" ) // The AccountFunc type is an adapter to allow the use of ordinary diff --git a/app/sephirah/internal/data/internal/ent/image.go b/internal/data/internal/ent/image.go similarity index 96% rename from app/sephirah/internal/data/internal/ent/image.go rename to internal/data/internal/ent/image.go index 88e6b886..cb5f51a1 100644 --- a/app/sephirah/internal/data/internal/ent/image.go +++ b/internal/data/internal/ent/image.go @@ -9,9 +9,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/image/image.go b/internal/data/internal/ent/image/image.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/image/image.go rename to internal/data/internal/ent/image/image.go diff --git a/app/sephirah/internal/data/internal/ent/image/where.go b/internal/data/internal/ent/image/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/image/where.go rename to internal/data/internal/ent/image/where.go index 735b345d..7cfc99f5 100644 --- a/app/sephirah/internal/data/internal/ent/image/where.go +++ b/internal/data/internal/ent/image/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/image_create.go b/internal/data/internal/ent/image_create.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/image_create.go rename to internal/data/internal/ent/image_create.go index 6a21b86c..35469a33 100644 --- a/app/sephirah/internal/data/internal/ent/image_create.go +++ b/internal/data/internal/ent/image_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/image_delete.go b/internal/data/internal/ent/image_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/image_delete.go rename to internal/data/internal/ent/image_delete.go index d0ce75f8..7fb7a4e3 100644 --- a/app/sephirah/internal/data/internal/ent/image_delete.go +++ b/internal/data/internal/ent/image_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // ImageDelete is the builder for deleting a Image entity. diff --git a/app/sephirah/internal/data/internal/ent/image_query.go b/internal/data/internal/ent/image_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/image_query.go rename to internal/data/internal/ent/image_query.go index 60a7e624..01723528 100644 --- a/app/sephirah/internal/data/internal/ent/image_query.go +++ b/internal/data/internal/ent/image_query.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/image_update.go b/internal/data/internal/ent/image_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/image_update.go rename to internal/data/internal/ent/image_update.go index f4179de0..cd71b071 100644 --- a/app/sephirah/internal/data/internal/ent/image_update.go +++ b/internal/data/internal/ent/image_update.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/migrate/migrate.go b/internal/data/internal/ent/migrate/migrate.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/migrate/migrate.go rename to internal/data/internal/ent/migrate/migrate.go diff --git a/app/sephirah/internal/data/internal/ent/migrate/schema.go b/internal/data/internal/ent/migrate/schema.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/migrate/schema.go rename to internal/data/internal/ent/migrate/schema.go diff --git a/app/sephirah/internal/data/internal/ent/mutation.go b/internal/data/internal/ent/mutation.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/mutation.go rename to internal/data/internal/ent/mutation.go index 86178320..d5ac75f0 100644 --- a/app/sephirah/internal/data/internal/ent/mutation.go +++ b/internal/data/internal/ent/mutation.go @@ -11,37 +11,37 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinstruntime" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/appinstruntime" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) const ( diff --git a/app/sephirah/internal/data/internal/ent/notifyflow.go b/internal/data/internal/ent/notifyflow.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifyflow.go rename to internal/data/internal/ent/notifyflow.go index 904286a2..7640a5bf 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflow.go +++ b/internal/data/internal/ent/notifyflow.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflow/notifyflow.go b/internal/data/internal/ent/notifyflow/notifyflow.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/notifyflow/notifyflow.go rename to internal/data/internal/ent/notifyflow/notifyflow.go diff --git a/app/sephirah/internal/data/internal/ent/notifyflow/where.go b/internal/data/internal/ent/notifyflow/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/notifyflow/where.go rename to internal/data/internal/ent/notifyflow/where.go index fc280273..50253654 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflow/where.go +++ b/internal/data/internal/ent/notifyflow/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflow_create.go b/internal/data/internal/ent/notifyflow_create.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifyflow_create.go rename to internal/data/internal/ent/notifyflow_create.go index 4016798c..4a5e74b2 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflow_create.go +++ b/internal/data/internal/ent/notifyflow_create.go @@ -11,12 +11,12 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflow_delete.go b/internal/data/internal/ent/notifyflow_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/notifyflow_delete.go rename to internal/data/internal/ent/notifyflow_delete.go index 1af1c4db..18adb2e9 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflow_delete.go +++ b/internal/data/internal/ent/notifyflow_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // NotifyFlowDelete is the builder for deleting a NotifyFlow entity. diff --git a/app/sephirah/internal/data/internal/ent/notifyflow_query.go b/internal/data/internal/ent/notifyflow_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifyflow_query.go rename to internal/data/internal/ent/notifyflow_query.go index 5dd0fbc9..d6a11e71 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflow_query.go +++ b/internal/data/internal/ent/notifyflow_query.go @@ -12,13 +12,13 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflow_update.go b/internal/data/internal/ent/notifyflow_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifyflow_update.go rename to internal/data/internal/ent/notifyflow_update.go index f440b5d8..9edf65d1 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflow_update.go +++ b/internal/data/internal/ent/notifyflow_update.go @@ -11,13 +11,13 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflowsource.go b/internal/data/internal/ent/notifyflowsource.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/notifyflowsource.go rename to internal/data/internal/ent/notifyflowsource.go index 983e262e..c4adac4b 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowsource.go +++ b/internal/data/internal/ent/notifyflowsource.go @@ -10,9 +10,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflowsource/notifyflowsource.go b/internal/data/internal/ent/notifyflowsource/notifyflowsource.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/notifyflowsource/notifyflowsource.go rename to internal/data/internal/ent/notifyflowsource/notifyflowsource.go diff --git a/app/sephirah/internal/data/internal/ent/notifyflowsource/where.go b/internal/data/internal/ent/notifyflowsource/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/notifyflowsource/where.go rename to internal/data/internal/ent/notifyflowsource/where.go index 05e1e6db..e9072ca5 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowsource/where.go +++ b/internal/data/internal/ent/notifyflowsource/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflowsource_create.go b/internal/data/internal/ent/notifyflowsource_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/notifyflowsource_create.go rename to internal/data/internal/ent/notifyflowsource_create.go index b0b85c11..ec8b59ee 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowsource_create.go +++ b/internal/data/internal/ent/notifyflowsource_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflowsource_delete.go b/internal/data/internal/ent/notifyflowsource_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/notifyflowsource_delete.go rename to internal/data/internal/ent/notifyflowsource_delete.go index 410a1e43..f7575d1d 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowsource_delete.go +++ b/internal/data/internal/ent/notifyflowsource_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // NotifyFlowSourceDelete is the builder for deleting a NotifyFlowSource entity. diff --git a/app/sephirah/internal/data/internal/ent/notifyflowsource_query.go b/internal/data/internal/ent/notifyflowsource_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifyflowsource_query.go rename to internal/data/internal/ent/notifyflowsource_query.go index 31fa66a1..c38cfaad 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowsource_query.go +++ b/internal/data/internal/ent/notifyflowsource_query.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflowsource_update.go b/internal/data/internal/ent/notifyflowsource_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifyflowsource_update.go rename to internal/data/internal/ent/notifyflowsource_update.go index 5e8b9419..c18c86d7 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowsource_update.go +++ b/internal/data/internal/ent/notifyflowsource_update.go @@ -12,10 +12,10 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/dialect/sql/sqljson" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflowtarget.go b/internal/data/internal/ent/notifyflowtarget.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/notifyflowtarget.go rename to internal/data/internal/ent/notifyflowtarget.go index c389e65d..b3e6e0b8 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowtarget.go +++ b/internal/data/internal/ent/notifyflowtarget.go @@ -10,9 +10,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflowtarget/notifyflowtarget.go b/internal/data/internal/ent/notifyflowtarget/notifyflowtarget.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/notifyflowtarget/notifyflowtarget.go rename to internal/data/internal/ent/notifyflowtarget/notifyflowtarget.go diff --git a/app/sephirah/internal/data/internal/ent/notifyflowtarget/where.go b/internal/data/internal/ent/notifyflowtarget/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/notifyflowtarget/where.go rename to internal/data/internal/ent/notifyflowtarget/where.go index 5c6000c5..5480043f 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowtarget/where.go +++ b/internal/data/internal/ent/notifyflowtarget/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflowtarget_create.go b/internal/data/internal/ent/notifyflowtarget_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/notifyflowtarget_create.go rename to internal/data/internal/ent/notifyflowtarget_create.go index ef7cf167..da3e4617 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowtarget_create.go +++ b/internal/data/internal/ent/notifyflowtarget_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflowtarget_delete.go b/internal/data/internal/ent/notifyflowtarget_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/notifyflowtarget_delete.go rename to internal/data/internal/ent/notifyflowtarget_delete.go index d85df517..fa13adc1 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowtarget_delete.go +++ b/internal/data/internal/ent/notifyflowtarget_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // NotifyFlowTargetDelete is the builder for deleting a NotifyFlowTarget entity. diff --git a/app/sephirah/internal/data/internal/ent/notifyflowtarget_query.go b/internal/data/internal/ent/notifyflowtarget_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifyflowtarget_query.go rename to internal/data/internal/ent/notifyflowtarget_query.go index 8edd2f1e..7308d0f4 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowtarget_query.go +++ b/internal/data/internal/ent/notifyflowtarget_query.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifyflowtarget_update.go b/internal/data/internal/ent/notifyflowtarget_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifyflowtarget_update.go rename to internal/data/internal/ent/notifyflowtarget_update.go index ecb3c090..a0201902 100644 --- a/app/sephirah/internal/data/internal/ent/notifyflowtarget_update.go +++ b/internal/data/internal/ent/notifyflowtarget_update.go @@ -12,10 +12,10 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/dialect/sql/sqljson" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifysource.go b/internal/data/internal/ent/notifysource.go similarity index 96% rename from app/sephirah/internal/data/internal/ent/notifysource.go rename to internal/data/internal/ent/notifysource.go index 2c982bb1..692e1e44 100644 --- a/app/sephirah/internal/data/internal/ent/notifysource.go +++ b/internal/data/internal/ent/notifysource.go @@ -9,10 +9,10 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifysource/notifysource.go b/internal/data/internal/ent/notifysource/notifysource.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/notifysource/notifysource.go rename to internal/data/internal/ent/notifysource/notifysource.go diff --git a/app/sephirah/internal/data/internal/ent/notifysource/where.go b/internal/data/internal/ent/notifysource/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/notifysource/where.go rename to internal/data/internal/ent/notifysource/where.go index 3a554184..a8956b3c 100644 --- a/app/sephirah/internal/data/internal/ent/notifysource/where.go +++ b/internal/data/internal/ent/notifysource/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifysource_create.go b/internal/data/internal/ent/notifysource_create.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifysource_create.go rename to internal/data/internal/ent/notifysource_create.go index 63817f43..5b488e8e 100644 --- a/app/sephirah/internal/data/internal/ent/notifysource_create.go +++ b/internal/data/internal/ent/notifysource_create.go @@ -11,12 +11,12 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifysource_delete.go b/internal/data/internal/ent/notifysource_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/notifysource_delete.go rename to internal/data/internal/ent/notifysource_delete.go index c0b293e4..f2b88d77 100644 --- a/app/sephirah/internal/data/internal/ent/notifysource_delete.go +++ b/internal/data/internal/ent/notifysource_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // NotifySourceDelete is the builder for deleting a NotifySource entity. diff --git a/app/sephirah/internal/data/internal/ent/notifysource_query.go b/internal/data/internal/ent/notifysource_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifysource_query.go rename to internal/data/internal/ent/notifysource_query.go index 5d6c1bfe..bdc304ea 100644 --- a/app/sephirah/internal/data/internal/ent/notifysource_query.go +++ b/internal/data/internal/ent/notifysource_query.go @@ -12,13 +12,13 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifysource_update.go b/internal/data/internal/ent/notifysource_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifysource_update.go rename to internal/data/internal/ent/notifysource_update.go index 70f40449..884ebef8 100644 --- a/app/sephirah/internal/data/internal/ent/notifysource_update.go +++ b/internal/data/internal/ent/notifysource_update.go @@ -11,13 +11,13 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifytarget.go b/internal/data/internal/ent/notifytarget.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/notifytarget.go rename to internal/data/internal/ent/notifytarget.go index 53a3035e..a245a7c2 100644 --- a/app/sephirah/internal/data/internal/ent/notifytarget.go +++ b/internal/data/internal/ent/notifytarget.go @@ -10,10 +10,10 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // NotifyTarget is the model entity for the NotifyTarget schema. diff --git a/app/sephirah/internal/data/internal/ent/notifytarget/notifytarget.go b/internal/data/internal/ent/notifytarget/notifytarget.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/notifytarget/notifytarget.go rename to internal/data/internal/ent/notifytarget/notifytarget.go diff --git a/app/sephirah/internal/data/internal/ent/notifytarget/where.go b/internal/data/internal/ent/notifytarget/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/notifytarget/where.go rename to internal/data/internal/ent/notifytarget/where.go index d33b757d..35c6564d 100644 --- a/app/sephirah/internal/data/internal/ent/notifytarget/where.go +++ b/internal/data/internal/ent/notifytarget/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifytarget_create.go b/internal/data/internal/ent/notifytarget_create.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifytarget_create.go rename to internal/data/internal/ent/notifytarget_create.go index 0e3cf31b..4c163aa1 100644 --- a/app/sephirah/internal/data/internal/ent/notifytarget_create.go +++ b/internal/data/internal/ent/notifytarget_create.go @@ -11,12 +11,12 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // NotifyTargetCreate is the builder for creating a NotifyTarget entity. diff --git a/app/sephirah/internal/data/internal/ent/notifytarget_delete.go b/internal/data/internal/ent/notifytarget_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/notifytarget_delete.go rename to internal/data/internal/ent/notifytarget_delete.go index 116c3841..f2ee5107 100644 --- a/app/sephirah/internal/data/internal/ent/notifytarget_delete.go +++ b/internal/data/internal/ent/notifytarget_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // NotifyTargetDelete is the builder for deleting a NotifyTarget entity. diff --git a/app/sephirah/internal/data/internal/ent/notifytarget_query.go b/internal/data/internal/ent/notifytarget_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifytarget_query.go rename to internal/data/internal/ent/notifytarget_query.go index 12b56e00..22701918 100644 --- a/app/sephirah/internal/data/internal/ent/notifytarget_query.go +++ b/internal/data/internal/ent/notifytarget_query.go @@ -12,11 +12,11 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/notifytarget_update.go b/internal/data/internal/ent/notifytarget_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/notifytarget_update.go rename to internal/data/internal/ent/notifytarget_update.go index d176c04e..e8f81787 100644 --- a/app/sephirah/internal/data/internal/ent/notifytarget_update.go +++ b/internal/data/internal/ent/notifytarget_update.go @@ -11,13 +11,13 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // NotifyTargetUpdate is the builder for updating NotifyTarget entities. diff --git a/app/sephirah/internal/data/internal/ent/portercontext.go b/internal/data/internal/ent/portercontext.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/portercontext.go rename to internal/data/internal/ent/portercontext.go index f5616433..45da06bc 100644 --- a/app/sephirah/internal/data/internal/ent/portercontext.go +++ b/internal/data/internal/ent/portercontext.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/portercontext/portercontext.go b/internal/data/internal/ent/portercontext/portercontext.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/portercontext/portercontext.go rename to internal/data/internal/ent/portercontext/portercontext.go diff --git a/app/sephirah/internal/data/internal/ent/portercontext/where.go b/internal/data/internal/ent/portercontext/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/portercontext/where.go rename to internal/data/internal/ent/portercontext/where.go index e2b4e72c..a087da8b 100644 --- a/app/sephirah/internal/data/internal/ent/portercontext/where.go +++ b/internal/data/internal/ent/portercontext/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/portercontext_create.go b/internal/data/internal/ent/portercontext_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/portercontext_create.go rename to internal/data/internal/ent/portercontext_create.go index 3185dad7..ad51e77b 100644 --- a/app/sephirah/internal/data/internal/ent/portercontext_create.go +++ b/internal/data/internal/ent/portercontext_create.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/portercontext_delete.go b/internal/data/internal/ent/portercontext_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/portercontext_delete.go rename to internal/data/internal/ent/portercontext_delete.go index 8e461fbe..903da1cc 100644 --- a/app/sephirah/internal/data/internal/ent/portercontext_delete.go +++ b/internal/data/internal/ent/portercontext_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // PorterContextDelete is the builder for deleting a PorterContext entity. diff --git a/app/sephirah/internal/data/internal/ent/portercontext_query.go b/internal/data/internal/ent/portercontext_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/portercontext_query.go rename to internal/data/internal/ent/portercontext_query.go index 9a63ab23..d5a20aa0 100644 --- a/app/sephirah/internal/data/internal/ent/portercontext_query.go +++ b/internal/data/internal/ent/portercontext_query.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/portercontext_update.go b/internal/data/internal/ent/portercontext_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/portercontext_update.go rename to internal/data/internal/ent/portercontext_update.go index 1932857f..7d63c1d6 100644 --- a/app/sephirah/internal/data/internal/ent/portercontext_update.go +++ b/internal/data/internal/ent/portercontext_update.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/porterinstance.go b/internal/data/internal/ent/porterinstance.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/porterinstance.go rename to internal/data/internal/ent/porterinstance.go index 9d5d3b5d..c8a9ff98 100644 --- a/app/sephirah/internal/data/internal/ent/porterinstance.go +++ b/internal/data/internal/ent/porterinstance.go @@ -10,9 +10,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // PorterInstance is the model entity for the PorterInstance schema. diff --git a/app/sephirah/internal/data/internal/ent/porterinstance/porterinstance.go b/internal/data/internal/ent/porterinstance/porterinstance.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/porterinstance/porterinstance.go rename to internal/data/internal/ent/porterinstance/porterinstance.go diff --git a/app/sephirah/internal/data/internal/ent/porterinstance/where.go b/internal/data/internal/ent/porterinstance/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/porterinstance/where.go rename to internal/data/internal/ent/porterinstance/where.go index 03fa7bf7..083751d4 100644 --- a/app/sephirah/internal/data/internal/ent/porterinstance/where.go +++ b/internal/data/internal/ent/porterinstance/where.go @@ -6,7 +6,7 @@ import ( "time" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/porterinstance_create.go b/internal/data/internal/ent/porterinstance_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/porterinstance_create.go rename to internal/data/internal/ent/porterinstance_create.go index 0cd74429..012e787f 100644 --- a/app/sephirah/internal/data/internal/ent/porterinstance_create.go +++ b/internal/data/internal/ent/porterinstance_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // PorterInstanceCreate is the builder for creating a PorterInstance entity. diff --git a/app/sephirah/internal/data/internal/ent/porterinstance_delete.go b/internal/data/internal/ent/porterinstance_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/porterinstance_delete.go rename to internal/data/internal/ent/porterinstance_delete.go index eae5ee7c..95da78c8 100644 --- a/app/sephirah/internal/data/internal/ent/porterinstance_delete.go +++ b/internal/data/internal/ent/porterinstance_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" ) // PorterInstanceDelete is the builder for deleting a PorterInstance entity. diff --git a/app/sephirah/internal/data/internal/ent/porterinstance_query.go b/internal/data/internal/ent/porterinstance_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/porterinstance_query.go rename to internal/data/internal/ent/porterinstance_query.go index 2bdc1f30..1b069314 100644 --- a/app/sephirah/internal/data/internal/ent/porterinstance_query.go +++ b/internal/data/internal/ent/porterinstance_query.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/porterinstance_update.go b/internal/data/internal/ent/porterinstance_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/porterinstance_update.go rename to internal/data/internal/ent/porterinstance_update.go index e94cd401..2160798b 100644 --- a/app/sephirah/internal/data/internal/ent/porterinstance_update.go +++ b/internal/data/internal/ent/porterinstance_update.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) // PorterInstanceUpdate is the builder for updating PorterInstance entities. diff --git a/app/sephirah/internal/data/internal/ent/predicate/predicate.go b/internal/data/internal/ent/predicate/predicate.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/predicate/predicate.go rename to internal/data/internal/ent/predicate/predicate.go diff --git a/app/sephirah/internal/data/internal/ent/runtime.go b/internal/data/internal/ent/runtime.go similarity index 91% rename from app/sephirah/internal/data/internal/ent/runtime.go rename to internal/data/internal/ent/runtime.go index 36fb4597..6f61852f 100644 --- a/app/sephirah/internal/data/internal/ent/runtime.go +++ b/internal/data/internal/ent/runtime.go @@ -5,34 +5,34 @@ package ent import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appbinary" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinstruntime" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfigaction" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/schema" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appbinary" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/appinstruntime" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfigaction" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + "github.com/tuihub/librarian/internal/data/internal/ent/schema" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" ) // The init function reads all schema descriptors with runtime code diff --git a/internal/data/internal/ent/runtime/runtime.go b/internal/data/internal/ent/runtime/runtime.go new file mode 100644 index 00000000..475d4c6f --- /dev/null +++ b/internal/data/internal/ent/runtime/runtime.go @@ -0,0 +1,10 @@ +// Code generated by ent, DO NOT EDIT. + +package runtime + +// The schema-stitching logic is generated in github.com/tuihub/librarian/internal/data/internal/ent/runtime.go + +const ( + Version = "v0.14.3" // Version of ent codegen. + Sum = "h1:wokAV/kIlH9TeklJWGGS7AYJdVckr0DloWjIcO9iIIQ=" // Sum of ent codegen. +) diff --git a/app/sephirah/internal/data/internal/ent/schema/account.go b/internal/data/internal/ent/schema/account.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/account.go rename to internal/data/internal/ent/schema/account.go diff --git a/app/sephirah/internal/data/internal/ent/schema/app.go b/internal/data/internal/ent/schema/app.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/app.go rename to internal/data/internal/ent/schema/app.go diff --git a/app/sephirah/internal/data/internal/ent/schema/app_binary.go b/internal/data/internal/ent/schema/app_binary.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/app_binary.go rename to internal/data/internal/ent/schema/app_binary.go diff --git a/app/sephirah/internal/data/internal/ent/schema/app_info.go b/internal/data/internal/ent/schema/app_info.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/app_info.go rename to internal/data/internal/ent/schema/app_info.go diff --git a/app/sephirah/internal/data/internal/ent/schema/app_inst.go b/internal/data/internal/ent/schema/app_inst.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/app_inst.go rename to internal/data/internal/ent/schema/app_inst.go diff --git a/app/sephirah/internal/data/internal/ent/schema/app_inst_run_time.go b/internal/data/internal/ent/schema/app_inst_run_time.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/app_inst_run_time.go rename to internal/data/internal/ent/schema/app_inst_run_time.go diff --git a/app/sephirah/internal/data/internal/ent/schema/device_info.go b/internal/data/internal/ent/schema/device_info.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/device_info.go rename to internal/data/internal/ent/schema/device_info.go diff --git a/app/sephirah/internal/data/internal/ent/schema/feed.go b/internal/data/internal/ent/schema/feed.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/feed.go rename to internal/data/internal/ent/schema/feed.go diff --git a/app/sephirah/internal/data/internal/ent/schema/feed_action_set.go b/internal/data/internal/ent/schema/feed_action_set.go similarity index 90% rename from app/sephirah/internal/data/internal/ent/schema/feed_action_set.go rename to internal/data/internal/ent/schema/feed_action_set.go index 8648e0d4..a62c8874 100644 --- a/app/sephirah/internal/data/internal/ent/schema/feed_action_set.go +++ b/internal/data/internal/ent/schema/feed_action_set.go @@ -3,7 +3,7 @@ package schema import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/model/modelsupervisor" "entgo.io/ent" "entgo.io/ent/schema/edge" diff --git a/app/sephirah/internal/data/internal/ent/schema/feed_config.go b/internal/data/internal/ent/schema/feed_config.go similarity index 95% rename from app/sephirah/internal/data/internal/ent/schema/feed_config.go rename to internal/data/internal/ent/schema/feed_config.go index 5eefe32e..74ab460d 100644 --- a/app/sephirah/internal/data/internal/ent/schema/feed_config.go +++ b/internal/data/internal/ent/schema/feed_config.go @@ -3,8 +3,8 @@ package schema import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" "entgo.io/ent" "entgo.io/ent/schema/edge" diff --git a/app/sephirah/internal/data/internal/ent/schema/feed_config_action.go b/internal/data/internal/ent/schema/feed_config_action.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/feed_config_action.go rename to internal/data/internal/ent/schema/feed_config_action.go diff --git a/app/sephirah/internal/data/internal/ent/schema/feed_item.go b/internal/data/internal/ent/schema/feed_item.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/feed_item.go rename to internal/data/internal/ent/schema/feed_item.go diff --git a/app/sephirah/internal/data/internal/ent/schema/feed_item_collection.go b/internal/data/internal/ent/schema/feed_item_collection.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/feed_item_collection.go rename to internal/data/internal/ent/schema/feed_item_collection.go diff --git a/app/sephirah/internal/data/internal/ent/schema/file.go b/internal/data/internal/ent/schema/file.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/file.go rename to internal/data/internal/ent/schema/file.go diff --git a/app/sephirah/internal/data/internal/ent/schema/image.go b/internal/data/internal/ent/schema/image.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/image.go rename to internal/data/internal/ent/schema/image.go diff --git a/app/sephirah/internal/data/internal/ent/schema/notify_flow.go b/internal/data/internal/ent/schema/notify_flow.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/notify_flow.go rename to internal/data/internal/ent/schema/notify_flow.go diff --git a/app/sephirah/internal/data/internal/ent/schema/notify_flow_source.go b/internal/data/internal/ent/schema/notify_flow_source.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/notify_flow_source.go rename to internal/data/internal/ent/schema/notify_flow_source.go diff --git a/app/sephirah/internal/data/internal/ent/schema/notify_flow_taget.go b/internal/data/internal/ent/schema/notify_flow_taget.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/notify_flow_taget.go rename to internal/data/internal/ent/schema/notify_flow_taget.go diff --git a/app/sephirah/internal/data/internal/ent/schema/notify_source.go b/internal/data/internal/ent/schema/notify_source.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/notify_source.go rename to internal/data/internal/ent/schema/notify_source.go diff --git a/app/sephirah/internal/data/internal/ent/schema/notify_target.go b/internal/data/internal/ent/schema/notify_target.go similarity index 92% rename from app/sephirah/internal/data/internal/ent/schema/notify_target.go rename to internal/data/internal/ent/schema/notify_target.go index 0b4c713f..98bdf73d 100644 --- a/app/sephirah/internal/data/internal/ent/schema/notify_target.go +++ b/internal/data/internal/ent/schema/notify_target.go @@ -3,7 +3,7 @@ package schema import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/model/modelsupervisor" "entgo.io/ent" "entgo.io/ent/schema/edge" diff --git a/app/sephirah/internal/data/internal/ent/schema/porter_context.go b/internal/data/internal/ent/schema/porter_context.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/porter_context.go rename to internal/data/internal/ent/schema/porter_context.go diff --git a/app/sephirah/internal/data/internal/ent/schema/porter_instance.go b/internal/data/internal/ent/schema/porter_instance.go similarity index 92% rename from app/sephirah/internal/data/internal/ent/schema/porter_instance.go rename to internal/data/internal/ent/schema/porter_instance.go index 66b8051f..752867fc 100644 --- a/app/sephirah/internal/data/internal/ent/schema/porter_instance.go +++ b/internal/data/internal/ent/schema/porter_instance.go @@ -3,7 +3,7 @@ package schema import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/model/modelsupervisor" "entgo.io/ent" "entgo.io/ent/schema/field" diff --git a/app/sephirah/internal/data/internal/ent/schema/schema.go b/internal/data/internal/ent/schema/schema.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/schema.go rename to internal/data/internal/ent/schema/schema.go diff --git a/app/sephirah/internal/data/internal/ent/schema/system_notification.go b/internal/data/internal/ent/schema/system_notification.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/system_notification.go rename to internal/data/internal/ent/schema/system_notification.go diff --git a/app/sephirah/internal/data/internal/ent/schema/tag.go b/internal/data/internal/ent/schema/tag.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/tag.go rename to internal/data/internal/ent/schema/tag.go diff --git a/app/sephirah/internal/data/internal/ent/schema/user.go b/internal/data/internal/ent/schema/user.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/user.go rename to internal/data/internal/ent/schema/user.go diff --git a/app/sephirah/internal/data/internal/ent/schema/user_device.go b/internal/data/internal/ent/schema/user_device.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/user_device.go rename to internal/data/internal/ent/schema/user_device.go diff --git a/app/sephirah/internal/data/internal/ent/schema/user_session.go b/internal/data/internal/ent/schema/user_session.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/schema/user_session.go rename to internal/data/internal/ent/schema/user_session.go diff --git a/app/sephirah/internal/data/internal/ent/systemnotification.go b/internal/data/internal/ent/systemnotification.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/systemnotification.go rename to internal/data/internal/ent/systemnotification.go index 39572a0f..f8458e59 100644 --- a/app/sephirah/internal/data/internal/ent/systemnotification.go +++ b/internal/data/internal/ent/systemnotification.go @@ -9,7 +9,7 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/systemnotification/systemnotification.go b/internal/data/internal/ent/systemnotification/systemnotification.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/systemnotification/systemnotification.go rename to internal/data/internal/ent/systemnotification/systemnotification.go diff --git a/app/sephirah/internal/data/internal/ent/systemnotification/where.go b/internal/data/internal/ent/systemnotification/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/systemnotification/where.go rename to internal/data/internal/ent/systemnotification/where.go index c07a9fda..97e6bc37 100644 --- a/app/sephirah/internal/data/internal/ent/systemnotification/where.go +++ b/internal/data/internal/ent/systemnotification/where.go @@ -6,7 +6,7 @@ import ( "time" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/systemnotification_create.go b/internal/data/internal/ent/systemnotification_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/systemnotification_create.go rename to internal/data/internal/ent/systemnotification_create.go index 5b1351c7..8da2ff73 100644 --- a/app/sephirah/internal/data/internal/ent/systemnotification_create.go +++ b/internal/data/internal/ent/systemnotification_create.go @@ -11,7 +11,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/systemnotification_delete.go b/internal/data/internal/ent/systemnotification_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/systemnotification_delete.go rename to internal/data/internal/ent/systemnotification_delete.go index 08d0b8cb..e214b1c8 100644 --- a/app/sephirah/internal/data/internal/ent/systemnotification_delete.go +++ b/internal/data/internal/ent/systemnotification_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" ) // SystemNotificationDelete is the builder for deleting a SystemNotification entity. diff --git a/app/sephirah/internal/data/internal/ent/systemnotification_query.go b/internal/data/internal/ent/systemnotification_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/systemnotification_query.go rename to internal/data/internal/ent/systemnotification_query.go index 2cb205a0..2798a33d 100644 --- a/app/sephirah/internal/data/internal/ent/systemnotification_query.go +++ b/internal/data/internal/ent/systemnotification_query.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/systemnotification_update.go b/internal/data/internal/ent/systemnotification_update.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/systemnotification_update.go rename to internal/data/internal/ent/systemnotification_update.go index 8bf545b4..f62581e9 100644 --- a/app/sephirah/internal/data/internal/ent/systemnotification_update.go +++ b/internal/data/internal/ent/systemnotification_update.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/tag.go b/internal/data/internal/ent/tag.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/tag.go rename to internal/data/internal/ent/tag.go index 1e41a8b0..f0fc3975 100644 --- a/app/sephirah/internal/data/internal/ent/tag.go +++ b/internal/data/internal/ent/tag.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/tag/tag.go b/internal/data/internal/ent/tag/tag.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/tag/tag.go rename to internal/data/internal/ent/tag/tag.go diff --git a/app/sephirah/internal/data/internal/ent/tag/where.go b/internal/data/internal/ent/tag/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/tag/where.go rename to internal/data/internal/ent/tag/where.go index d0ce2648..32b0e083 100644 --- a/app/sephirah/internal/data/internal/ent/tag/where.go +++ b/internal/data/internal/ent/tag/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/tag_create.go b/internal/data/internal/ent/tag_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/tag_create.go rename to internal/data/internal/ent/tag_create.go index ca736f9c..cd786d51 100644 --- a/app/sephirah/internal/data/internal/ent/tag_create.go +++ b/internal/data/internal/ent/tag_create.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/tag_delete.go b/internal/data/internal/ent/tag_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/tag_delete.go rename to internal/data/internal/ent/tag_delete.go index 661ac8da..437a89b7 100644 --- a/app/sephirah/internal/data/internal/ent/tag_delete.go +++ b/internal/data/internal/ent/tag_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" ) // TagDelete is the builder for deleting a Tag entity. diff --git a/app/sephirah/internal/data/internal/ent/tag_query.go b/internal/data/internal/ent/tag_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/tag_query.go rename to internal/data/internal/ent/tag_query.go index 74b18aad..5bba0c05 100644 --- a/app/sephirah/internal/data/internal/ent/tag_query.go +++ b/internal/data/internal/ent/tag_query.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/tag_update.go b/internal/data/internal/ent/tag_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/tag_update.go rename to internal/data/internal/ent/tag_update.go index 729af7b4..aa1b2b5c 100644 --- a/app/sephirah/internal/data/internal/ent/tag_update.go +++ b/internal/data/internal/ent/tag_update.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/tx.go b/internal/data/internal/ent/tx.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/tx.go rename to internal/data/internal/ent/tx.go diff --git a/app/sephirah/internal/data/internal/ent/user.go b/internal/data/internal/ent/user.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/user.go rename to internal/data/internal/ent/user.go index c5eb7a55..d63f88e9 100644 --- a/app/sephirah/internal/data/internal/ent/user.go +++ b/internal/data/internal/ent/user.go @@ -9,7 +9,7 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/user/user.go b/internal/data/internal/ent/user/user.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/user/user.go rename to internal/data/internal/ent/user/user.go diff --git a/app/sephirah/internal/data/internal/ent/user/where.go b/internal/data/internal/ent/user/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/user/where.go rename to internal/data/internal/ent/user/where.go index 9c59acef..1bda701a 100644 --- a/app/sephirah/internal/data/internal/ent/user/where.go +++ b/internal/data/internal/ent/user/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/user_create.go b/internal/data/internal/ent/user_create.go similarity index 96% rename from app/sephirah/internal/data/internal/ent/user_create.go rename to internal/data/internal/ent/user_create.go index 1d18a894..208525f2 100644 --- a/app/sephirah/internal/data/internal/ent/user_create.go +++ b/internal/data/internal/ent/user_create.go @@ -11,23 +11,23 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/user_delete.go b/internal/data/internal/ent/user_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/user_delete.go rename to internal/data/internal/ent/user_delete.go index e3651572..87367ee5 100644 --- a/app/sephirah/internal/data/internal/ent/user_delete.go +++ b/internal/data/internal/ent/user_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" ) // UserDelete is the builder for deleting a User entity. diff --git a/app/sephirah/internal/data/internal/ent/user_query.go b/internal/data/internal/ent/user_query.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/user_query.go rename to internal/data/internal/ent/user_query.go index 26d5b71f..3fe0b5bf 100644 --- a/app/sephirah/internal/data/internal/ent/user_query.go +++ b/internal/data/internal/ent/user_query.go @@ -12,24 +12,24 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/user_update.go b/internal/data/internal/ent/user_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/user_update.go rename to internal/data/internal/ent/user_update.go index 7c576cf0..825ec3fc 100644 --- a/app/sephirah/internal/data/internal/ent/user_update.go +++ b/internal/data/internal/ent/user_update.go @@ -11,24 +11,24 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinst" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/file" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/image" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifysource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/tag" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/appinst" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/file" + "github.com/tuihub/librarian/internal/data/internal/ent/image" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifysource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/tag" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/userdevice.go b/internal/data/internal/ent/userdevice.go similarity index 96% rename from app/sephirah/internal/data/internal/ent/userdevice.go rename to internal/data/internal/ent/userdevice.go index 29a6fd41..90517dad 100644 --- a/app/sephirah/internal/data/internal/ent/userdevice.go +++ b/internal/data/internal/ent/userdevice.go @@ -9,9 +9,9 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/userdevice/userdevice.go b/internal/data/internal/ent/userdevice/userdevice.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/userdevice/userdevice.go rename to internal/data/internal/ent/userdevice/userdevice.go diff --git a/app/sephirah/internal/data/internal/ent/userdevice/where.go b/internal/data/internal/ent/userdevice/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/userdevice/where.go rename to internal/data/internal/ent/userdevice/where.go index 40d76ecc..0bf62043 100644 --- a/app/sephirah/internal/data/internal/ent/userdevice/where.go +++ b/internal/data/internal/ent/userdevice/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/userdevice_create.go b/internal/data/internal/ent/userdevice_create.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/userdevice_create.go rename to internal/data/internal/ent/userdevice_create.go index 31b6285c..f5ff1130 100644 --- a/app/sephirah/internal/data/internal/ent/userdevice_create.go +++ b/internal/data/internal/ent/userdevice_create.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/userdevice_delete.go b/internal/data/internal/ent/userdevice_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/userdevice_delete.go rename to internal/data/internal/ent/userdevice_delete.go index af4b919c..4dc22f6d 100644 --- a/app/sephirah/internal/data/internal/ent/userdevice_delete.go +++ b/internal/data/internal/ent/userdevice_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" ) // UserDeviceDelete is the builder for deleting a UserDevice entity. diff --git a/app/sephirah/internal/data/internal/ent/userdevice_query.go b/internal/data/internal/ent/userdevice_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/userdevice_query.go rename to internal/data/internal/ent/userdevice_query.go index d41e366a..33a91b34 100644 --- a/app/sephirah/internal/data/internal/ent/userdevice_query.go +++ b/internal/data/internal/ent/userdevice_query.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/userdevice_update.go b/internal/data/internal/ent/userdevice_update.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/userdevice_update.go rename to internal/data/internal/ent/userdevice_update.go index 1f6510a5..47aba610 100644 --- a/app/sephirah/internal/data/internal/ent/userdevice_update.go +++ b/internal/data/internal/ent/userdevice_update.go @@ -11,10 +11,10 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/usersession.go b/internal/data/internal/ent/usersession.go similarity index 97% rename from app/sephirah/internal/data/internal/ent/usersession.go rename to internal/data/internal/ent/usersession.go index 201aa3d5..e38069e6 100644 --- a/app/sephirah/internal/data/internal/ent/usersession.go +++ b/internal/data/internal/ent/usersession.go @@ -9,8 +9,8 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/usersession/usersession.go b/internal/data/internal/ent/usersession/usersession.go similarity index 100% rename from app/sephirah/internal/data/internal/ent/usersession/usersession.go rename to internal/data/internal/ent/usersession/usersession.go diff --git a/app/sephirah/internal/data/internal/ent/usersession/where.go b/internal/data/internal/ent/usersession/where.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/usersession/where.go rename to internal/data/internal/ent/usersession/where.go index 416da51f..f1ca82c8 100644 --- a/app/sephirah/internal/data/internal/ent/usersession/where.go +++ b/internal/data/internal/ent/usersession/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/usersession_create.go b/internal/data/internal/ent/usersession_create.go similarity index 99% rename from app/sephirah/internal/data/internal/ent/usersession_create.go rename to internal/data/internal/ent/usersession_create.go index 06a50078..e9e284b0 100644 --- a/app/sephirah/internal/data/internal/ent/usersession_create.go +++ b/internal/data/internal/ent/usersession_create.go @@ -11,8 +11,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/usersession_delete.go b/internal/data/internal/ent/usersession_delete.go similarity index 93% rename from app/sephirah/internal/data/internal/ent/usersession_delete.go rename to internal/data/internal/ent/usersession_delete.go index 27209ee9..ba741712 100644 --- a/app/sephirah/internal/data/internal/ent/usersession_delete.go +++ b/internal/data/internal/ent/usersession_delete.go @@ -8,8 +8,8 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" ) // UserSessionDelete is the builder for deleting a UserSession entity. diff --git a/app/sephirah/internal/data/internal/ent/usersession_query.go b/internal/data/internal/ent/usersession_query.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/usersession_query.go rename to internal/data/internal/ent/usersession_query.go index 468b3aa7..1a3c16ec 100644 --- a/app/sephirah/internal/data/internal/ent/usersession_query.go +++ b/internal/data/internal/ent/usersession_query.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/internal/ent/usersession_update.go b/internal/data/internal/ent/usersession_update.go similarity index 98% rename from app/sephirah/internal/data/internal/ent/usersession_update.go rename to internal/data/internal/ent/usersession_update.go index f6885d60..92e5922d 100644 --- a/app/sephirah/internal/data/internal/ent/usersession_update.go +++ b/internal/data/internal/ent/usersession_update.go @@ -11,9 +11,9 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/predicate" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/predicate" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" "github.com/tuihub/librarian/internal/model" ) diff --git a/app/sephirah/internal/data/angela.go b/internal/data/kether.go similarity index 73% rename from app/sephirah/internal/data/angela.go rename to internal/data/kether.go index 3b1063b7..4c6a9839 100644 --- a/app/sephirah/internal/data/angela.go +++ b/internal/data/kether.go @@ -4,40 +4,38 @@ import ( "context" "time" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizangela" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/converter" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/app" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/appinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/data/internal/converter" + "github.com/tuihub/librarian/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/app" + "github.com/tuihub/librarian/internal/data/internal/ent/appinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/model/modelyesod" "entgo.io/ent/dialect/sql" ) -type angelaRepo struct { +type KetherRepo struct { data *Data } -// NewAngelaRepo . -func NewAngelaRepo(data *Data) bizangela.AngelaRepo { - return &angelaRepo{ +// NewKetherRepo . +func NewKetherRepo(data *Data) *KetherRepo { + return &KetherRepo{ data: data, } } -func (a *angelaRepo) UpsertAccount(ctx context.Context, acc modeltiphereth.Account) error { - return a.data.db.Account.Create(). +func (k *KetherRepo) UpsertAccount(ctx context.Context, acc model.Account) error { + return k.data.db.Account.Create(). SetID(acc.ID). SetPlatform(acc.Platform). SetPlatformAccountID(acc.PlatformAccountID). @@ -55,10 +53,10 @@ func (a *angelaRepo) UpsertAccount(ctx context.Context, acc modeltiphereth.Accou Exec(ctx) } -func (a *angelaRepo) UpsertAppInfo( //nolint:gocognit //TODO +func (k *KetherRepo) UpsertAppInfo( //nolint:gocognit //TODO ctx context.Context, ap *modelgebura.AppInfo, internal *modelgebura.AppInfo, ) error { - return a.data.WithTx(ctx, func(tx *ent.Tx) error { + return k.data.WithTx(ctx, func(tx *ent.Tx) error { q := tx.AppInfo.Create(). SetID(ap.ID). SetInternal(ap.Internal). @@ -137,13 +135,13 @@ func (a *angelaRepo) UpsertAppInfo( //nolint:gocognit //TODO }) } -func (a *angelaRepo) UpsertAppInfos(ctx context.Context, al []*modelgebura.AppInfo) error { +func (k *KetherRepo) UpsertAppInfos(ctx context.Context, al []*modelgebura.AppInfo) error { apps := make([]*ent.AppInfoCreate, len(al)) for i, ap := range al { if ap.Details == nil { ap.Details = new(modelgebura.AppInfoDetails) } - apps[i] = a.data.db.AppInfo.Create(). + apps[i] = k.data.db.AppInfo.Create(). SetID(ap.ID). SetInternal(ap.Internal). SetSource(ap.Source). @@ -164,7 +162,7 @@ func (a *angelaRepo) UpsertAppInfos(ctx context.Context, al []*modelgebura.AppIn SetVersion(ap.Details.Version) } } - return a.data.db.AppInfo. + return k.data.db.AppInfo. CreateBulk(apps...). OnConflict( sql.ConflictColumns(appinfo.FieldSource, appinfo.FieldSourceAppID), @@ -175,10 +173,10 @@ func (a *angelaRepo) UpsertAppInfos(ctx context.Context, al []*modelgebura.AppIn Exec(ctx) } -func (a *angelaRepo) AccountPurchaseAppInfos( +func (k *KetherRepo) AccountPurchaseAppInfos( ctx context.Context, id model.InternalID, ids []model.InternalID, ) error { - return a.data.WithTx(ctx, func(tx *ent.Tx) error { + return k.data.WithTx(ctx, func(tx *ent.Tx) error { appIDs, err := tx.App.Query().Where( app.IDIn(ids...), ). @@ -186,15 +184,15 @@ func (a *angelaRepo) AccountPurchaseAppInfos( if err != nil { return err } - return a.data.db.Account. + return k.data.db.Account. UpdateOneID(id). AddPurchasedAppIDs(appIDs...). Exec(ctx) }) } -func (a *angelaRepo) UpsertFeed(ctx context.Context, f *modelfeed.Feed) error { - return a.data.WithTx(ctx, func(tx *ent.Tx) error { +func (k *KetherRepo) UpsertFeed(ctx context.Context, f *modelfeed.Feed) error { + return k.data.WithTx(ctx, func(tx *ent.Tx) error { conf, err := tx.FeedConfig.Query(). Where(feedconfig.IDEQ(f.ID)). Only(ctx) @@ -219,12 +217,12 @@ func (a *angelaRepo) UpsertFeed(ctx context.Context, f *modelfeed.Feed) error { }) } -func (a *angelaRepo) CheckNewFeedItems(ctx context.Context, items []*modelfeed.Item, feedID model.InternalID) ([]string, error) { +func (k *KetherRepo) CheckNewFeedItems(ctx context.Context, items []*modelfeed.Item, feedID model.InternalID) ([]string, error) { guids := make([]string, 0, len(items)) for _, item := range items { guids = append(guids, item.GUID) } - existItems, err := a.data.db.FeedItem.Query().Where( + existItems, err := k.data.db.FeedItem.Query().Where( feeditem.FeedID(feedID), feeditem.GUIDIn(guids...), ).Select(feeditem.FieldGUID).All(ctx) @@ -244,14 +242,14 @@ func (a *angelaRepo) CheckNewFeedItems(ctx context.Context, items []*modelfeed.I return res, nil } -func (a *angelaRepo) UpsertFeedItems( +func (k *KetherRepo) UpsertFeedItems( ctx context.Context, items []*modelfeed.Item, feedID model.InternalID, ) error { il := make([]*ent.FeedItemCreate, len(items)) for i, item := range items { - il[i] = a.data.db.FeedItem.Create(). + il[i] = k.data.db.FeedItem.Create(). SetFeedID(feedID). SetID(item.ID). SetTitle(item.Title). @@ -274,7 +272,7 @@ func (a *angelaRepo) UpsertFeedItems( il[i].SetPublishedParsed(time.Now()) } } - return a.data.db.FeedItem.CreateBulk(il...). + return k.data.db.FeedItem.CreateBulk(il...). OnConflict( sql.ConflictColumns(feeditem.FieldFeedID, feeditem.FieldGUID), // @@ -287,8 +285,8 @@ func (a *angelaRepo) UpsertFeedItems( ).Exec(ctx) } -func (a *angelaRepo) UpdateFeedPullStatus(ctx context.Context, conf *modelyesod.FeedConfig) error { - c, err := a.data.db.FeedConfig.Query().Where(feedconfig.IDEQ(conf.ID)).Only(ctx) +func (k *KetherRepo) UpdateFeedPullStatus(ctx context.Context, conf *modelyesod.FeedConfig) error { + c, err := k.data.db.FeedConfig.Query().Where(feedconfig.IDEQ(conf.ID)).Only(ctx) if err != nil { return err } @@ -300,16 +298,16 @@ func (a *angelaRepo) UpdateFeedPullStatus(ctx context.Context, conf *modelyesod. Exec(ctx) } -func (a *angelaRepo) GetFeedItem(ctx context.Context, id model.InternalID) (*modelfeed.Item, error) { - item, err := a.data.db.FeedItem.Get(ctx, id) +func (k *KetherRepo) GetFeedItem(ctx context.Context, id model.InternalID) (*modelfeed.Item, error) { + item, err := k.data.db.FeedItem.Get(ctx, id) if err != nil { return nil, err } return converter.ToBizFeedItem(item), nil } -func (a *angelaRepo) GetFeedActions(ctx context.Context, id model.InternalID) ([]*modelyesod.FeedActionSet, error) { - actions, err := a.data.db.FeedActionSet.Query(). +func (k *KetherRepo) GetFeedActions(ctx context.Context, id model.InternalID) ([]*modelyesod.FeedActionSet, error) { + actions, err := k.data.db.FeedActionSet.Query(). Where(feedactionset.HasFeedConfigWith(feedconfig.IDEQ(id))). All(ctx) if err != nil { @@ -318,10 +316,10 @@ func (a *angelaRepo) GetFeedActions(ctx context.Context, id model.InternalID) ([ return converter.ToBizFeedActionSetList(actions), nil } -func (a *angelaRepo) GetNotifyTargetItems(ctx context.Context, id model.InternalID, paging model.Paging) (*modelsupervisor.FeatureRequest, []*modelfeed.Item, error) { +func (k *KetherRepo) GetNotifyTargetItems(ctx context.Context, id model.InternalID, paging model.Paging) (*modelsupervisor.FeatureRequest, []*modelfeed.Item, error) { var fr *modelsupervisor.FeatureRequest var it []*modelfeed.Item - err := a.data.WithTx(ctx, func(tx *ent.Tx) error { + err := k.data.WithTx(ctx, func(tx *ent.Tx) error { target, err := tx.NotifyTarget.Get(ctx, id) if err != nil { return err @@ -348,12 +346,12 @@ func (a *angelaRepo) GetNotifyTargetItems(ctx context.Context, id model.Internal return fr, it, nil } -func (a *angelaRepo) AddFeedItemsToCollection( +func (k *KetherRepo) AddFeedItemsToCollection( ctx context.Context, collectionID model.InternalID, itemIDs []model.InternalID, ) error { - return a.data.db.FeedItemCollection.UpdateOneID(collectionID). + return k.data.db.FeedItemCollection.UpdateOneID(collectionID). AddFeedItemIDs(itemIDs...). Exec(ctx) } diff --git a/app/sephirah/internal/data/netzach.go b/internal/data/netzach.go similarity index 84% rename from app/sephirah/internal/data/netzach.go rename to internal/data/netzach.go index 48cab91f..43915262 100644 --- a/app/sephirah/internal/data/netzach.go +++ b/internal/data/netzach.go @@ -4,32 +4,31 @@ import ( "context" "fmt" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biznetzach" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/converter" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflow" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowsource" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifyflowtarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/notifytarget" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/systemnotification" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/data/internal/converter" + "github.com/tuihub/librarian/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflow" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowsource" + "github.com/tuihub/librarian/internal/data/internal/ent/notifyflowtarget" + "github.com/tuihub/librarian/internal/data/internal/ent/notifytarget" + "github.com/tuihub/librarian/internal/data/internal/ent/systemnotification" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelnetzach" "entgo.io/ent/dialect/sql" ) -type netzachRepo struct { +type NetzachRepo struct { data *Data } -func NewNetzachRepo(data *Data) biznetzach.NetzachRepo { - return &netzachRepo{ +func NewNetzachRepo(data *Data) *NetzachRepo { + return &NetzachRepo{ data: data, } } -func (n *netzachRepo) CreateNotifyTarget(ctx context.Context, id model.InternalID, t *modelnetzach.NotifyTarget) error { +func (n *NetzachRepo) CreateNotifyTarget(ctx context.Context, id model.InternalID, t *modelnetzach.NotifyTarget) error { q := n.data.db.NotifyTarget.Create(). SetOwnerID(id). SetID(t.ID). @@ -40,7 +39,7 @@ func (n *netzachRepo) CreateNotifyTarget(ctx context.Context, id model.InternalI return q.Exec(ctx) } -func (n *netzachRepo) UpdateNotifyTarget( +func (n *NetzachRepo) UpdateNotifyTarget( ctx context.Context, userID model.InternalID, t *modelnetzach.NotifyTarget, @@ -64,7 +63,7 @@ func (n *netzachRepo) UpdateNotifyTarget( return q.Exec(ctx) } -func (n *netzachRepo) ListNotifyTargets( +func (n *NetzachRepo) ListNotifyTargets( ctx context.Context, paging model.Paging, userID model.InternalID, @@ -94,7 +93,7 @@ func (n *netzachRepo) ListNotifyTargets( return converter.ToBizNotifyTargetList(res), int64(total), nil } -func (n *netzachRepo) GetNotifyTarget(ctx context.Context, id model.InternalID) (*modelnetzach.NotifyTarget, error) { +func (n *NetzachRepo) GetNotifyTarget(ctx context.Context, id model.InternalID) (*modelnetzach.NotifyTarget, error) { res, err := n.data.db.NotifyTarget.Query().Where(notifytarget.IDEQ(id)).Only(ctx) if err != nil { return nil, err @@ -102,7 +101,7 @@ func (n *netzachRepo) GetNotifyTarget(ctx context.Context, id model.InternalID) return converter.ToBizNotifyTarget(res), nil } -func (n *netzachRepo) CreateNotifyFlow(ctx context.Context, userID model.InternalID, f *modelnetzach.NotifyFlow) error { +func (n *NetzachRepo) CreateNotifyFlow(ctx context.Context, userID model.InternalID, f *modelnetzach.NotifyFlow) error { err := n.data.WithTx(ctx, func(tx *ent.Tx) error { err := tx.NotifyFlow.Create(). SetID(f.ID). @@ -157,7 +156,7 @@ func (n *netzachRepo) CreateNotifyFlow(ctx context.Context, userID model.Interna return nil } -func (n *netzachRepo) UpdateNotifyFlow( //nolint:gocognit // TODO +func (n *NetzachRepo) UpdateNotifyFlow( //nolint:gocognit // TODO ctx context.Context, userID model.InternalID, f *modelnetzach.NotifyFlow, @@ -228,7 +227,7 @@ func (n *netzachRepo) UpdateNotifyFlow( //nolint:gocognit // TODO return nil } -func (n *netzachRepo) ListNotifyFlows( +func (n *NetzachRepo) ListNotifyFlows( ctx context.Context, paging model.Paging, userID model.InternalID, @@ -260,7 +259,7 @@ func (n *netzachRepo) ListNotifyFlows( return res, int64(total), nil } -func (n *netzachRepo) GetNotifyFlow(ctx context.Context, id model.InternalID) (*modelnetzach.NotifyFlow, error) { +func (n *NetzachRepo) GetNotifyFlow(ctx context.Context, id model.InternalID) (*modelnetzach.NotifyFlow, error) { res, err := n.data.db.NotifyFlow.Query(). Where(notifyflow.IDEQ(id)). WithNotifyFlowSource(). @@ -272,7 +271,7 @@ func (n *netzachRepo) GetNotifyFlow(ctx context.Context, id model.InternalID) (* return converter.ToBizNotifyFlowExtend(res), nil } -func (n *netzachRepo) GetNotifyFlowIDsWithFeed(ctx context.Context, id model.InternalID) ([]model.InternalID, error) { +func (n *NetzachRepo) GetNotifyFlowIDsWithFeed(ctx context.Context, id model.InternalID) ([]model.InternalID, error) { ids, err := n.data.db.NotifyFlow.Query().Where( notifyflow.HasNotifyFlowSourceWith(notifyflowsource.NotifySourceIDEQ(id)), ).IDs(ctx) @@ -282,7 +281,7 @@ func (n *netzachRepo) GetNotifyFlowIDsWithFeed(ctx context.Context, id model.Int return ids, nil } -func (n *netzachRepo) UpsertSystemNotification( +func (n *NetzachRepo) UpsertSystemNotification( ctx context.Context, userID model.InternalID, notification *modelnetzach.SystemNotification, @@ -311,7 +310,7 @@ func (n *netzachRepo) UpsertSystemNotification( ).Exec(ctx) } -func (n *netzachRepo) ListSystemNotifications(ctx context.Context, paging model.Paging, userID *model.InternalID, types []modelnetzach.SystemNotificationType, levels []modelnetzach.SystemNotificationLevel, statuses []modelnetzach.SystemNotificationStatus) ([]*modelnetzach.SystemNotification, int64, error) { +func (n *NetzachRepo) ListSystemNotifications(ctx context.Context, paging model.Paging, userID *model.InternalID, types []modelnetzach.SystemNotificationType, levels []modelnetzach.SystemNotificationLevel, statuses []modelnetzach.SystemNotificationStatus) ([]*modelnetzach.SystemNotification, int64, error) { q := n.data.db.SystemNotification.Query(). Order(ent.Desc(systemnotification.FieldUpdatedAt)) if userID != nil { diff --git a/app/sephirah/internal/data/tiphereth.go b/internal/data/tiphereth.go similarity index 76% rename from app/sephirah/internal/data/tiphereth.go rename to internal/data/tiphereth.go index 56a21fda..a53ae487 100644 --- a/app/sephirah/internal/data/tiphereth.go +++ b/internal/data/tiphereth.go @@ -4,39 +4,35 @@ import ( "context" "errors" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biztiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/converter" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/account" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/deviceinfo" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/portercontext" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/porterinstance" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/userdevice" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/usersession" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - "github.com/tuihub/librarian/internal/lib/libauth" + "github.com/tuihub/librarian/internal/data/internal/converter" + "github.com/tuihub/librarian/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/data/internal/ent/account" + "github.com/tuihub/librarian/internal/data/internal/ent/deviceinfo" + "github.com/tuihub/librarian/internal/data/internal/ent/portercontext" + "github.com/tuihub/librarian/internal/data/internal/ent/porterinstance" + "github.com/tuihub/librarian/internal/data/internal/ent/user" + "github.com/tuihub/librarian/internal/data/internal/ent/userdevice" + "github.com/tuihub/librarian/internal/data/internal/ent/usersession" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" "entgo.io/ent/dialect/sql" ) -type tipherethRepo struct { +type TipherethRepo struct { data *Data } -// NewTipherethRepo . -func NewTipherethRepo(data *Data) biztiphereth.TipherethRepo { - return &tipherethRepo{ +func NewTipherethRepo(data *Data) *TipherethRepo { + return &TipherethRepo{ data: data, } } -func (t tipherethRepo) FetchUserByPassword( +func (t *TipherethRepo) FetchUserByPassword( ctx context.Context, username, password string, -) (*modeltiphereth.User, error) { +) (*model.User, error) { u, err := t.data.db.User.Query().Where( user.UsernameEQ(username), user.PasswordEQ(password), @@ -47,10 +43,10 @@ func (t tipherethRepo) FetchUserByPassword( return converter.ToBizUser(u), nil } -func (t tipherethRepo) CreateDevice( +func (t *TipherethRepo) CreateDevice( ctx context.Context, userID model.InternalID, - info *modeltiphereth.DeviceInfo, + info *model.DeviceInfo, clientLocalID *string, ) (model.InternalID, error) { var res model.InternalID @@ -88,10 +84,10 @@ func (t tipherethRepo) CreateDevice( return res, nil } -func (t tipherethRepo) FetchDeviceInfo( +func (t *TipherethRepo) FetchDeviceInfo( ctx context.Context, deviceID model.InternalID, -) (*modeltiphereth.DeviceInfo, error) { +) (*model.DeviceInfo, error) { res, err := t.data.db.DeviceInfo.Get(ctx, deviceID) if err != nil { return nil, err @@ -99,7 +95,7 @@ func (t tipherethRepo) FetchDeviceInfo( return converter.ToBizDeviceInfo(res), nil } -func (t tipherethRepo) ListDevices(ctx context.Context, id model.InternalID) ([]*modeltiphereth.DeviceInfo, error) { +func (t *TipherethRepo) ListDevices(ctx context.Context, id model.InternalID) ([]*model.DeviceInfo, error) { devices, err := t.data.db.DeviceInfo.Query().Where( deviceinfo.HasUserWith(user.IDEQ(id)), ).All(ctx) @@ -109,7 +105,7 @@ func (t tipherethRepo) ListDevices(ctx context.Context, id model.InternalID) ([] return converter.ToBizDeviceInfoList(devices), nil } -func (t tipherethRepo) CreateUserSession(ctx context.Context, session *modeltiphereth.UserSession) error { +func (t *TipherethRepo) CreateUserSession(ctx context.Context, session *model.UserSession) error { return t.data.WithTx(ctx, func(tx *ent.Tx) error { q := tx.UserSession.Create(). SetID(session.ID). @@ -146,11 +142,11 @@ func (t tipherethRepo) CreateUserSession(ctx context.Context, session *modeltiph }) } -func (t tipherethRepo) FetchUserSession( +func (t *TipherethRepo) FetchUserSession( ctx context.Context, userID model.InternalID, token string, -) (*modeltiphereth.UserSession, error) { +) (*model.UserSession, error) { session, err := t.data.db.UserSession.Query().Where( usersession.UserIDEQ(userID), usersession.RefreshTokenEQ(token), @@ -165,17 +161,17 @@ func (t tipherethRepo) FetchUserSession( return res, nil } -func (t tipherethRepo) ListUserSessions( +func (t *TipherethRepo) ListUserSessions( ctx context.Context, id model.InternalID, -) ([]*modeltiphereth.UserSession, error) { +) ([]*model.UserSession, error) { session, err := t.data.db.UserSession.Query().Where( usersession.UserIDEQ(id), ).WithDeviceInfo().All(ctx) if err != nil { return nil, err } - res := make([]*modeltiphereth.UserSession, len(session)) + res := make([]*model.UserSession, len(session)) for i, s := range session { res[i] = converter.ToBizUserSession(s) if s.Edges.DeviceInfo != nil { @@ -185,7 +181,7 @@ func (t tipherethRepo) ListUserSessions( return res, nil } -func (t tipherethRepo) UpdateUserSession(ctx context.Context, session *modeltiphereth.UserSession) error { +func (t *TipherethRepo) UpdateUserSession(ctx context.Context, session *model.UserSession) error { return t.data.WithTx(ctx, func(tx *ent.Tx) error { q := tx.UserSession.UpdateOneID(session.ID). SetRefreshToken(session.RefreshToken). @@ -205,7 +201,7 @@ func (t tipherethRepo) UpdateUserSession(ctx context.Context, session *modeltiph }) } -func (t tipherethRepo) DeleteUserSession( +func (t *TipherethRepo) DeleteUserSession( ctx context.Context, userID model.InternalID, sessionID model.InternalID, @@ -215,45 +211,44 @@ func (t tipherethRepo) DeleteUserSession( ).Exec(ctx) } -func (t tipherethRepo) CreateUser(ctx context.Context, u *modeltiphereth.User, c model.InternalID) error { +func (t *TipherethRepo) CreateUser(ctx context.Context, u *model.User, c model.InternalID) error { q := t.data.db.User.Create(). SetID(u.ID). - SetUsername(u.UserName). - SetPassword(u.PassWord). + SetUsername(u.Username). + SetPassword(u.Password). SetStatus(converter.ToEntUserStatus(u.Status)). SetType(converter.ToEntUserType(u.Type)). SetCreatorID(c) return q.Exec(ctx) } -func (t tipherethRepo) UpdateUser(ctx context.Context, u *modeltiphereth.User, password string) error { +func (t *TipherethRepo) UpdateUser(ctx context.Context, u *model.User, password string) error { q := t.data.db.User.Update(). Where(user.IDEQ(u.ID)) - if u.UserName != "" { - q.SetUsername(u.UserName) + if u.Username != "" { + q.SetUsername(u.Username) } - if u.PassWord != "" { - q.Where(user.PasswordEQ(password)).SetPassword(u.PassWord) + if u.Password != "" { + q.Where(user.PasswordEQ(password)).SetPassword(u.Password) } - if u.Type != libauth.UserTypeUnspecified { + if u.Type != model.UserTypeUnspecified { q.SetType(converter.ToEntUserType(u.Type)) } - if u.Status != modeltiphereth.UserStatusUnspecified { + if u.Status != model.UserStatusUnspecified { q.SetStatus(converter.ToEntUserStatus(u.Status)) } return q.Exec(ctx) } -func (t tipherethRepo) ListUsers( +func (t *TipherethRepo) ListUsers( ctx context.Context, paging model.Paging, ids []model.InternalID, - types []libauth.UserType, - statuses []modeltiphereth.UserStatus, + types []model.UserType, + statuses []model.UserStatus, exclude []model.InternalID, - creator model.InternalID, -) ([]*modeltiphereth.User, int64, error) { - q := t.data.db.User.Query().Where(user.IDEQ(creator)).QueryCreatedUser() +) ([]*model.User, int64, error) { + q := t.data.db.User.Query() if len(ids) > 0 { q.Where(user.IDIn(ids...)) } @@ -266,6 +261,10 @@ func (t tipherethRepo) ListUsers( if len(exclude) > 0 { q.Where(user.IDNotIn(exclude...)) } + count, err := q.Count(ctx) + if err != nil { + return nil, 0, err + } u, err := q. Limit(paging.ToLimit()). Offset(paging.ToOffset()). @@ -273,14 +272,10 @@ func (t tipherethRepo) ListUsers( if err != nil { return nil, 0, err } - count, err := q.Count(ctx) - if err != nil { - return nil, 0, err - } return converter.ToBizUserList(u), int64(count), nil } -func (t tipherethRepo) GetUser(ctx context.Context, id model.InternalID) (*modeltiphereth.User, error) { +func (t *TipherethRepo) GetUser(ctx context.Context, id model.InternalID) (*model.User, error) { u, err := t.data.db.User.Get(ctx, id) if err != nil { return nil, err @@ -288,13 +283,13 @@ func (t tipherethRepo) GetUser(ctx context.Context, id model.InternalID) (*model return converter.ToBizUser(u), nil } -func (t tipherethRepo) GetUserCount(ctx context.Context) (int, error) { +func (t *TipherethRepo) GetUserCount(ctx context.Context) (int, error) { return t.data.db.User.Query().Count(ctx) } -func (t tipherethRepo) LinkAccount( +func (t *TipherethRepo) LinkAccount( ctx context.Context, - a modeltiphereth.Account, + a model.Account, userID model.InternalID, ) (model.InternalID, error) { accountID := a.ID @@ -348,7 +343,7 @@ func (t tipherethRepo) LinkAccount( return accountID, nil } -func (t tipherethRepo) UnLinkAccount(ctx context.Context, a modeltiphereth.Account, u model.InternalID) error { +func (t *TipherethRepo) UnLinkAccount(ctx context.Context, a model.Account, u model.InternalID) error { return t.data.db.Account.Update().Where( account.PlatformEQ(a.Platform), account.PlatformAccountIDEQ(a.PlatformAccountID), @@ -358,10 +353,10 @@ func (t tipherethRepo) UnLinkAccount(ctx context.Context, a modeltiphereth.Accou Exec(ctx) } -func (t tipherethRepo) ListLinkAccounts( +func (t *TipherethRepo) ListLinkAccounts( ctx context.Context, userID model.InternalID, -) ([]*modeltiphereth.Account, error) { +) ([]*model.Account, error) { a, err := t.data.db.Account.Query(). Where( account.HasBindUserWith(user.IDEQ(userID)), @@ -373,7 +368,7 @@ func (t tipherethRepo) ListLinkAccounts( return converter.ToBizAccountList(a), nil } -func (t tipherethRepo) UpsertPorters(ctx context.Context, il []*modelsupervisor.PorterInstance) error { +func (t *TipherethRepo) UpsertPorters(ctx context.Context, il []*modelsupervisor.PorterInstance) error { instances := make([]*ent.PorterInstanceCreate, len(il)) for i, instance := range il { if instance.BinarySummary == nil { @@ -407,7 +402,7 @@ func (t tipherethRepo) UpsertPorters(ctx context.Context, il []*modelsupervisor. Exec(ctx) } -func (t tipherethRepo) ListPorters( +func (t *TipherethRepo) ListPorters( ctx context.Context, paging model.Paging, ) ([]*modelsupervisor.PorterInstance, int64, error) { @@ -426,10 +421,10 @@ func (t tipherethRepo) ListPorters( return converter.ToBizPorterList(p), int64(count), nil } -func (t tipherethRepo) UpdatePorterStatus( +func (t *TipherethRepo) UpdatePorterStatus( ctx context.Context, id model.InternalID, - status modeltiphereth.UserStatus, + status model.UserStatus, ) (*modelsupervisor.PorterInstance, error) { pi, err := t.data.db.PorterInstance.Get(ctx, id) if err != nil { @@ -442,7 +437,7 @@ func (t tipherethRepo) UpdatePorterStatus( return converter.ToBizPorter(pi), nil } -func (t tipherethRepo) FetchPorterByAddress(ctx context.Context, address string) (*modelsupervisor.PorterInstance, error) { +func (t *TipherethRepo) FetchPorterByAddress(ctx context.Context, address string) (*modelsupervisor.PorterInstance, error) { p, err := t.data.db.PorterInstance.Query().Where( porterinstance.AddressEQ(address), ).Only(ctx) @@ -452,7 +447,7 @@ func (t tipherethRepo) FetchPorterByAddress(ctx context.Context, address string) return converter.ToBizPorter(p), nil } -func (t tipherethRepo) CreatePorterContext( +func (t *TipherethRepo) CreatePorterContext( ctx context.Context, userID model.InternalID, context *modelsupervisor.PorterContext, @@ -469,7 +464,7 @@ func (t tipherethRepo) CreatePorterContext( Exec(ctx) } -func (t tipherethRepo) ListPorterContexts( +func (t *TipherethRepo) ListPorterContexts( ctx context.Context, userID model.InternalID, paging model.Paging, @@ -491,7 +486,7 @@ func (t tipherethRepo) ListPorterContexts( return converter.ToBizPorterContextList(p), int64(count), nil } -func (t tipherethRepo) UpdatePorterContext( +func (t *TipherethRepo) UpdatePorterContext( ctx context.Context, userID model.InternalID, context *modelsupervisor.PorterContext, @@ -507,9 +502,9 @@ func (t tipherethRepo) UpdatePorterContext( Exec(ctx) } -func (t tipherethRepo) ListPorterGroups( +func (t *TipherethRepo) ListPorterGroups( ctx context.Context, - status []modeltiphereth.UserStatus, + status []model.UserStatus, ) ([]*modelsupervisor.PorterGroup, error) { var res []struct { ent.PorterInstance @@ -562,7 +557,7 @@ func (t tipherethRepo) ListPorterGroups( return pg, nil } -func (t tipherethRepo) FetchPorterContext( +func (t *TipherethRepo) FetchPorterContext( ctx context.Context, id model.InternalID, ) (*modelsupervisor.PorterContext, error) { @@ -573,7 +568,7 @@ func (t tipherethRepo) FetchPorterContext( return converter.ToBizPorterContext(res), nil } -func (t tipherethRepo) GetEnabledPorterContexts( +func (t *TipherethRepo) GetEnabledPorterContexts( ctx context.Context, ) ([]*modelsupervisor.PorterContext, error) { pc, err := t.data.db.PorterContext.Query().Where( diff --git a/app/sephirah/internal/data/yesod.go b/internal/data/yesod.go similarity index 87% rename from app/sephirah/internal/data/yesod.go rename to internal/data/yesod.go index efcfbe48..af654085 100644 --- a/app/sephirah/internal/data/yesod.go +++ b/internal/data/yesod.go @@ -4,34 +4,32 @@ import ( "context" "time" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizyesod" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/converter" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feed" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedactionset" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feedconfig" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditem" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/feeditemcollection" - "github.com/tuihub/librarian/app/sephirah/internal/data/internal/ent/user" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/data/internal/converter" + "github.com/tuihub/librarian/internal/data/internal/ent" + "github.com/tuihub/librarian/internal/data/internal/ent/feed" + "github.com/tuihub/librarian/internal/data/internal/ent/feedactionset" + "github.com/tuihub/librarian/internal/data/internal/ent/feedconfig" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditem" + "github.com/tuihub/librarian/internal/data/internal/ent/feeditemcollection" + "github.com/tuihub/librarian/internal/data/internal/ent/user" "github.com/tuihub/librarian/internal/lib/libtime" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelyesod" ) -type yesodRepo struct { +type YesodRepo struct { data *Data } // NewYesodRepo . -func NewYesodRepo(data *Data) bizyesod.YesodRepo { - return &yesodRepo{ +func NewYesodRepo(data *Data) *YesodRepo { + return &YesodRepo{ data: data, } } -func (y *yesodRepo) CreateFeedConfig(ctx context.Context, owner model.InternalID, c *modelyesod.FeedConfig) error { +func (y *YesodRepo) CreateFeedConfig(ctx context.Context, owner model.InternalID, c *modelyesod.FeedConfig) error { return y.data.WithTx(ctx, func(tx *ent.Tx) error { err := tx.FeedConfig.Create(). SetOwnerID(owner). @@ -60,7 +58,7 @@ func (y *yesodRepo) CreateFeedConfig(ctx context.Context, owner model.InternalID }) } -func (y *yesodRepo) UpdateFeedConfig(ctx context.Context, userID model.InternalID, c *modelyesod.FeedConfig) error { +func (y *YesodRepo) UpdateFeedConfig(ctx context.Context, userID model.InternalID, c *modelyesod.FeedConfig) error { return y.data.WithTx(ctx, func(tx *ent.Tx) error { q := tx.FeedConfig.Update(). Where( @@ -107,13 +105,13 @@ func (y *yesodRepo) UpdateFeedConfig(ctx context.Context, userID model.InternalI // UpdateFeedConfigAsInQueue set SetNextPullBeginAt to one day later to avoid repeat queue. // While pull success, UpsertFeed will set correct value. // While pull failed, server will retry task next day. -func (y *yesodRepo) UpdateFeedConfigAsInQueue(ctx context.Context, id model.InternalID) error { +func (y *YesodRepo) UpdateFeedConfigAsInQueue(ctx context.Context, id model.InternalID) error { q := y.data.db.FeedConfig.UpdateOneID(id). SetNextPullBeginAt(time.Now().Add(libtime.Day)) return q.Exec(ctx) } -func (y *yesodRepo) ListFeedConfigNeedPull(ctx context.Context, sources []string, +func (y *YesodRepo) ListFeedConfigNeedPull(ctx context.Context, sources []string, statuses []modelyesod.FeedConfigStatus, order modelyesod.ListFeedOrder, pullTime time.Time, i int) ([]*modelyesod.FeedConfig, error) { q := y.data.db.FeedConfig.Query() @@ -135,7 +133,7 @@ func (y *yesodRepo) ListFeedConfigNeedPull(ctx context.Context, sources []string return converter.ToBizFeedConfigList(feedConfigs), nil } -func (y *yesodRepo) ListFeedConfigs( +func (y *YesodRepo) ListFeedConfigs( ctx context.Context, userID model.InternalID, paging model.Paging, @@ -194,7 +192,7 @@ func (y *yesodRepo) ListFeedConfigs( return res, total, nil } -func (y *yesodRepo) ListFeedCategories(ctx context.Context, id model.InternalID) ([]string, error) { +func (y *YesodRepo) ListFeedCategories(ctx context.Context, id model.InternalID) ([]string, error) { res, err := y.data.db.FeedConfig.Query(). Where( feedconfig.HasOwnerWith(user.IDEQ(id)), @@ -208,7 +206,7 @@ func (y *yesodRepo) ListFeedCategories(ctx context.Context, id model.InternalID) return res, nil } -func (y *yesodRepo) ListFeedPlatforms(ctx context.Context, id model.InternalID) ([]string, error) { +func (y *YesodRepo) ListFeedPlatforms(ctx context.Context, id model.InternalID) ([]string, error) { res, err := y.data.db.FeedItem.Query(). Where( feeditem.HasFeedWith(feed.HasConfigWith(feedconfig.HasOwnerWith(user.IDEQ(id)))), @@ -222,7 +220,7 @@ func (y *yesodRepo) ListFeedPlatforms(ctx context.Context, id model.InternalID) return res, nil } -func (y *yesodRepo) ListFeedItems( +func (y *YesodRepo) ListFeedItems( ctx context.Context, userID model.InternalID, paging model.Paging, @@ -286,7 +284,7 @@ func (y *yesodRepo) ListFeedItems( return res, total, nil } -func (y *yesodRepo) GroupFeedItems( //nolint:gocognit //TODO +func (y *YesodRepo) GroupFeedItems( //nolint:gocognit //TODO ctx context.Context, userID model.InternalID, groups []model.TimeRange, @@ -348,7 +346,7 @@ func (y *yesodRepo) GroupFeedItems( //nolint:gocognit //TODO return res, nil } -func (y *yesodRepo) GetFeedItems( +func (y *YesodRepo) GetFeedItems( ctx context.Context, userID model.InternalID, ids []model.InternalID, @@ -377,13 +375,13 @@ func (y *yesodRepo) GetFeedItems( return res, nil } -func (y *yesodRepo) ReadFeedItem(ctx context.Context, userID model.InternalID, id model.InternalID) error { +func (y *YesodRepo) ReadFeedItem(ctx context.Context, userID model.InternalID, id model.InternalID) error { return y.data.db.FeedItem.UpdateOneID(id).Where( feeditem.HasFeedWith(feed.HasConfigWith(feedconfig.HasOwnerWith(user.IDEQ(userID)))), ).AddReadCount(1).Exec(ctx) } -func (y *yesodRepo) CreateFeedItemCollection( +func (y *YesodRepo) CreateFeedItemCollection( ctx context.Context, ownerID model.InternalID, collection *modelyesod.FeedItemCollection, @@ -397,7 +395,7 @@ func (y *yesodRepo) CreateFeedItemCollection( Exec(ctx) } -func (y *yesodRepo) UpdateFeedItemCollection( +func (y *YesodRepo) UpdateFeedItemCollection( ctx context.Context, ownerID model.InternalID, collection *modelyesod.FeedItemCollection, @@ -410,7 +408,7 @@ func (y *yesodRepo) UpdateFeedItemCollection( Exec(ctx) } -func (y *yesodRepo) ListFeedItemCollections( +func (y *YesodRepo) ListFeedItemCollections( ctx context.Context, ownerID model.InternalID, paging model.Paging, @@ -451,7 +449,7 @@ func (y *yesodRepo) ListFeedItemCollections( return res, total, nil } -func (y *yesodRepo) AddFeedItemToCollection( +func (y *YesodRepo) AddFeedItemToCollection( ctx context.Context, ownerID model.InternalID, collectionID model.InternalID, @@ -463,7 +461,7 @@ func (y *yesodRepo) AddFeedItemToCollection( Exec(ctx) } -func (y *yesodRepo) RemoveFeedItemFromCollection( +func (y *YesodRepo) RemoveFeedItemFromCollection( ctx context.Context, ownerID model.InternalID, collectionID model.InternalID, @@ -475,7 +473,7 @@ func (y *yesodRepo) RemoveFeedItemFromCollection( Exec(ctx) } -func (y *yesodRepo) ListFeedItemsInCollection( +func (y *YesodRepo) ListFeedItemsInCollection( ctx context.Context, ownerID model.InternalID, paging model.Paging, @@ -537,7 +535,7 @@ func (y *yesodRepo) ListFeedItemsInCollection( return res, total, nil } -func (y *yesodRepo) GetFeedOwner(ctx context.Context, id model.InternalID) (*modeltiphereth.User, error) { +func (y *YesodRepo) GetFeedOwner(ctx context.Context, id model.InternalID) (*model.User, error) { only, err := y.data.db.FeedConfig.Query().Where(feedconfig.IDEQ(id)).QueryOwner().Only(ctx) if err != nil { return nil, err @@ -545,7 +543,7 @@ func (y *yesodRepo) GetFeedOwner(ctx context.Context, id model.InternalID) (*mod return converter.ToBizUser(only), nil } -func (y *yesodRepo) CreateFeedActionSet(ctx context.Context, id model.InternalID, set *modelyesod.FeedActionSet) error { +func (y *YesodRepo) CreateFeedActionSet(ctx context.Context, id model.InternalID, set *modelyesod.FeedActionSet) error { return y.data.db.FeedActionSet.Create(). SetOwnerID(id). SetID(set.ID). @@ -555,7 +553,7 @@ func (y *yesodRepo) CreateFeedActionSet(ctx context.Context, id model.InternalID Exec(ctx) } -func (y *yesodRepo) UpdateFeedActionSet(ctx context.Context, id model.InternalID, set *modelyesod.FeedActionSet) error { +func (y *YesodRepo) UpdateFeedActionSet(ctx context.Context, id model.InternalID, set *modelyesod.FeedActionSet) error { return y.data.db.FeedActionSet.UpdateOneID(set.ID). Where(feedactionset.HasOwnerWith(user.IDEQ(id))). SetName(set.Name). @@ -564,7 +562,7 @@ func (y *yesodRepo) UpdateFeedActionSet(ctx context.Context, id model.InternalID Exec(ctx) } -func (y *yesodRepo) ListFeedActionSets(ctx context.Context, id model.InternalID, paging model.Paging) ([]*modelyesod.FeedActionSet, int, error) { +func (y *YesodRepo) ListFeedActionSets(ctx context.Context, id model.InternalID, paging model.Paging) ([]*modelyesod.FeedActionSet, int, error) { var res []*modelyesod.FeedActionSet var total int err := y.data.WithTx(ctx, func(tx *ent.Tx) error { diff --git a/internal/lib/libapp/app.go b/internal/lib/libapp/app.go index 3435e00d..1b6ecba3 100644 --- a/internal/lib/libapp/app.go +++ b/internal/lib/libapp/app.go @@ -131,7 +131,7 @@ func checkDataPath(path string) error { func loadFlags() Flags { var confPath string var dataPath string - flag.StringVar(&confPath, "conf", "", "config path, eg: --conf config.yaml") + flag.StringVar(&confPath, "conf", "", "config path, eg: --conf config.toml") flag.StringVar(&dataPath, "data", ".", "data path, eg: --data /opt/librarian/data") flag.Parse() return Flags{ diff --git a/internal/lib/libapp/inherent_settings_debug.go b/internal/lib/libapp/inherent_settings_debug.go index 8cf825cf..49250a8d 100644 --- a/internal/lib/libapp/inherent_settings_debug.go +++ b/internal/lib/libapp/inherent_settings_debug.go @@ -8,6 +8,6 @@ func getInherentSettings() InherentSettings { return InherentSettings{ EnablePanicRecovery: false, LogLevel: libzap.DebugLevel, - DefaultConfPath: "../../configs/config.yaml", + DefaultConfPath: "./configs/config.toml", } } diff --git a/internal/lib/libapp/inherent_settings_default.go b/internal/lib/libapp/inherent_settings_default.go index 57ddf4d5..2a32cb90 100644 --- a/internal/lib/libapp/inherent_settings_default.go +++ b/internal/lib/libapp/inherent_settings_default.go @@ -8,6 +8,6 @@ func getInherentSettings() InherentSettings { return InherentSettings{ EnablePanicRecovery: true, LogLevel: libzap.InfoLevel, - DefaultConfPath: "../../configs/config.yaml", + DefaultConfPath: "./configs/config.toml", } } diff --git a/internal/lib/libauth/jwt.go b/internal/lib/libauth/jwt.go index 19c1a7e9..c1c3c36b 100644 --- a/internal/lib/libauth/jwt.go +++ b/internal/lib/libauth/jwt.go @@ -2,7 +2,9 @@ package libauth import ( "context" + "errors" "fmt" + "net/http" "strings" "time" @@ -17,7 +19,7 @@ type Claims struct { UserID model.InternalID `json:"uid,string"` PorterID model.InternalID `json:"pid,string,omitempty"` Type ClaimsType `json:"ct"` - UserType UserType `json:"ut"` + UserType model.UserType `json:"ut"` TransferMetadata any `json:"tm,omitempty"` jwtv5.RegisteredClaims } @@ -32,16 +34,6 @@ const ( ClaimsTypeDownloadToken ) -type UserType int - -const ( - UserTypeUnspecified UserType = iota - UserTypeAdmin - UserTypeNormal - UserTypeSentinel - UserTypePorter -) - func (a *Auth) KeyFunc(t ClaimsType) jwtv5.Keyfunc { return func(token *jwtv5.Token) (interface{}, error) { return a.generateSecret(t), nil @@ -72,11 +64,42 @@ func RawFromContext(ctx context.Context) string { return "" } -func FromContextAssertUserType(ctx context.Context, userTypes ...UserType) *Claims { +func RawToContext(ctx context.Context, token string) context.Context { + return transport.NewServerContext(ctx, &Transport{ + kind: "", + endpoint: "", + operation: "", + reqHeader: newTokenHeader("Authorization", fmt.Sprintf("Bearer %s", token)), + }) +} + +func ValidateString(tokenString string, keyFunc jwtv5.Keyfunc) (bool, error) { + token, err := jwtv5.ParseWithClaims(tokenString, new(Claims), keyFunc) + if err != nil { + return false, err + } + return token.Valid, nil +} + +func FromString(tokenString string, keyFunc jwtv5.Keyfunc) (*Claims, error) { + token, err := jwtv5.ParseWithClaims(tokenString, new(Claims), keyFunc) + if err != nil { + return nil, err + } + if claims, ok := token.Claims.(*Claims); ok { + return claims, nil + } + return nil, errors.New("invalid claims type") +} + +func FromContextAssertUserType(ctx context.Context, userTypes ...model.UserType) *Claims { if userTypes == nil { - userTypes = []UserType{UserTypeAdmin, UserTypeNormal} + userTypes = []model.UserType{model.UserTypeAdmin, model.UserTypeNormal} } c := FromContext(ctx) + if c == nil { + return nil + } for _, ut := range userTypes { if c.UserType == ut { return c @@ -93,7 +116,7 @@ func (a *Auth) GenerateToken( uid model.InternalID, pid model.InternalID, claimsType ClaimsType, - userType UserType, + userType model.UserType, transferMetadata any, expire time.Duration, ) (string, error) { @@ -122,3 +145,58 @@ func (a *Auth) GenerateToken( token, err := tokenClaims.SignedString(a.generateSecret(claimsType)) return token, err } + +type headerCarrier http.Header + +func (hc headerCarrier) Get(key string) string { return http.Header(hc).Get(key) } + +func (hc headerCarrier) Set(key string, value string) { http.Header(hc).Set(key, value) } + +func (hc headerCarrier) Add(key string, value string) { http.Header(hc).Add(key, value) } + +// Keys lists the keys stored in this carrier. +func (hc headerCarrier) Keys() []string { + keys := make([]string, 0, len(hc)) + for k := range http.Header(hc) { + keys = append(keys, k) + } + return keys +} + +// Values returns a slice value associated with the passed key. +func (hc headerCarrier) Values(key string) []string { + return http.Header(hc).Values(key) +} + +func newTokenHeader(headerKey string, token string) *headerCarrier { + header := &headerCarrier{} + header.Set(headerKey, token) + return header +} + +type Transport struct { + kind transport.Kind + endpoint string + operation string + reqHeader transport.Header +} + +func (tr *Transport) Kind() transport.Kind { + return tr.kind +} + +func (tr *Transport) Endpoint() string { + return tr.endpoint +} + +func (tr *Transport) Operation() string { + return tr.operation +} + +func (tr *Transport) RequestHeader() transport.Header { + return tr.reqHeader +} + +func (tr *Transport) ReplyHeader() transport.Header { + return nil +} diff --git a/internal/lib/libauth/jwt_test.go b/internal/lib/libauth/jwt_test.go new file mode 100644 index 00000000..57a1a95b --- /dev/null +++ b/internal/lib/libauth/jwt_test.go @@ -0,0 +1,16 @@ +package libauth_test + +import ( + "context" + "testing" + + "github.com/tuihub/librarian/internal/lib/libauth" +) + +func Test_RawToContext(t *testing.T) { + token := "abcd" + ctx := context.Background() + if token != libauth.RawFromContext(libauth.RawToContext(ctx, token)) { + t.Error("RawToContext failed") + } +} diff --git a/app/sephirah/internal/model/modelbinah/callback.go b/internal/model/modelbinah/callback.go similarity index 100% rename from app/sephirah/internal/model/modelbinah/callback.go rename to internal/model/modelbinah/callback.go diff --git a/app/sephirah/internal/model/modelbinah/control.go b/internal/model/modelbinah/control.go similarity index 100% rename from app/sephirah/internal/model/modelbinah/control.go rename to internal/model/modelbinah/control.go diff --git a/app/sephirah/internal/model/modelbinah/modelbinah.go b/internal/model/modelbinah/modelbinah.go similarity index 100% rename from app/sephirah/internal/model/modelbinah/modelbinah.go rename to internal/model/modelbinah/modelbinah.go diff --git a/app/sephirah/internal/model/modelchesed/modelchesed.go b/internal/model/modelchesed/modelchesed.go similarity index 90% rename from app/sephirah/internal/model/modelchesed/modelchesed.go rename to internal/model/modelchesed/modelchesed.go index 0ac6b387..dae2a65f 100644 --- a/app/sephirah/internal/model/modelchesed/modelchesed.go +++ b/internal/model/modelchesed/modelchesed.go @@ -1,8 +1,6 @@ package modelchesed -import ( - "github.com/tuihub/librarian/internal/model" -) +import "github.com/tuihub/librarian/internal/model" type Image struct { ID model.InternalID diff --git a/app/sephirah/internal/model/modelgebura/modelgebura.go b/internal/model/modelgebura/modelgebura.go similarity index 100% rename from app/sephirah/internal/model/modelgebura/modelgebura.go rename to internal/model/modelgebura/modelgebura.go diff --git a/app/sephirah/internal/model/modelangela/modelangela.go b/internal/model/modelkether/modelkether.go similarity index 83% rename from app/sephirah/internal/model/modelangela/modelangela.go rename to internal/model/modelkether/modelkether.go index 00da75ea..9207ba02 100644 --- a/app/sephirah/internal/model/modelangela/modelangela.go +++ b/internal/model/modelkether/modelkether.go @@ -1,10 +1,10 @@ -package modelangela +package modelkether import ( - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/model/modelnetzach" ) type PullAccountAppInfoRelation struct { diff --git a/app/sephirah/internal/model/modelnetzach/modelnetzach.go b/internal/model/modelnetzach/modelnetzach.go similarity index 97% rename from app/sephirah/internal/model/modelnetzach/modelnetzach.go rename to internal/model/modelnetzach/modelnetzach.go index 89ef10ba..cdd42607 100644 --- a/app/sephirah/internal/model/modelnetzach/modelnetzach.go +++ b/internal/model/modelnetzach/modelnetzach.go @@ -3,8 +3,8 @@ package modelnetzach import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) type NotifyFlow struct { diff --git a/app/sephirah/internal/model/modelsupervisor/modelsupervisor.go b/internal/model/modelsupervisor/modelsupervisor.go similarity index 97% rename from app/sephirah/internal/model/modelsupervisor/modelsupervisor.go rename to internal/model/modelsupervisor/modelsupervisor.go index 0182255e..f074eb96 100644 --- a/app/sephirah/internal/model/modelsupervisor/modelsupervisor.go +++ b/internal/model/modelsupervisor/modelsupervisor.go @@ -3,7 +3,6 @@ package modelsupervisor import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" "github.com/tuihub/librarian/internal/lib/libtype" "github.com/tuihub/librarian/internal/model" ) @@ -30,7 +29,7 @@ type PorterInstance struct { Address string Region string FeatureSummary *PorterFeatureSummary - Status modeltiphereth.UserStatus + Status model.UserStatus ContextJSONSchema string } diff --git a/app/sephirah/internal/model/modelyesod/builtin_action.go b/internal/model/modelyesod/builtin_action.go similarity index 100% rename from app/sephirah/internal/model/modelyesod/builtin_action.go rename to internal/model/modelyesod/builtin_action.go diff --git a/app/sephirah/internal/model/modelyesod/builtin_action_test.go b/internal/model/modelyesod/builtin_action_test.go similarity index 91% rename from app/sephirah/internal/model/modelyesod/builtin_action_test.go rename to internal/model/modelyesod/builtin_action_test.go index 67872cdb..bb43469f 100644 --- a/app/sephirah/internal/model/modelyesod/builtin_action_test.go +++ b/internal/model/modelyesod/builtin_action_test.go @@ -3,7 +3,7 @@ package modelyesod_test import ( "testing" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" + "github.com/tuihub/librarian/internal/model/modelyesod" ) func TestGetSimpleKeywordFilterActionConfigSchema(t *testing.T) { diff --git a/app/sephirah/internal/model/modelyesod/modelyesod.go b/internal/model/modelyesod/modelyesod.go similarity index 93% rename from app/sephirah/internal/model/modelyesod/modelyesod.go rename to internal/model/modelyesod/modelyesod.go index cfa5ea64..ad7c13fe 100644 --- a/app/sephirah/internal/model/modelyesod/modelyesod.go +++ b/internal/model/modelyesod/modelyesod.go @@ -3,10 +3,10 @@ package modelyesod import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) type FeedItemDigest struct { diff --git a/app/sephirah/internal/model/modeltiphereth/modeltiphereth.go b/internal/model/tiphereth.go similarity index 75% rename from app/sephirah/internal/model/modeltiphereth/modeltiphereth.go rename to internal/model/tiphereth.go index e6fcece5..e55da6e1 100644 --- a/app/sephirah/internal/model/modeltiphereth/modeltiphereth.go +++ b/internal/model/tiphereth.go @@ -1,17 +1,14 @@ -package modeltiphereth +package model import ( "time" - - "github.com/tuihub/librarian/internal/lib/libauth" - "github.com/tuihub/librarian/internal/model" ) type User struct { - ID model.InternalID - UserName string - PassWord string - Type libauth.UserType + ID InternalID + Username string + Password string + Type UserType Status UserStatus } @@ -23,11 +20,21 @@ const ( UserStatusBlocked ) +type UserType int + +const ( + UserTypeUnspecified UserType = iota + UserTypeAdmin + UserTypeNormal + UserTypeSentinel + UserTypePorter +) + type AccessToken string type RefreshToken string type Account struct { - ID model.InternalID + ID InternalID Platform string PlatformAccountID string Name string @@ -37,14 +44,14 @@ type Account struct { } type PullAccountInfo struct { - ID model.InternalID + ID InternalID Platform string PlatformAccountID string } type UserSession struct { - ID model.InternalID - UserID model.InternalID + ID InternalID + UserID InternalID RefreshToken string DeviceInfo *DeviceInfo CreateAt time.Time @@ -52,7 +59,7 @@ type UserSession struct { } type DeviceInfo struct { - ID model.InternalID + ID InternalID DeviceName string SystemType SystemType SystemVersion string diff --git a/internal/service/angelaweb/angela_web.go b/internal/service/angelaweb/angela_web.go new file mode 100644 index 00000000..4776c9e5 --- /dev/null +++ b/internal/service/angelaweb/angela_web.go @@ -0,0 +1,71 @@ +package angelaweb + +import ( + "context" + "embed" + "net/http" + + "github.com/tuihub/librarian/internal/biz/biztiphereth" + "github.com/tuihub/librarian/internal/lib/libauth" + "github.com/tuihub/librarian/internal/lib/libcache" + "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/service/angelaweb/internal/api" + "github.com/tuihub/librarian/internal/service/angelaweb/internal/page" + + "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v2/middleware/logger" + "github.com/gofiber/template/html/v2" + "github.com/google/wire" +) + +var ProviderSet = wire.NewSet(NewAngelaWeb) + +type AngelaWeb struct { + apiHandler *api.Handler + pageBuilder *page.Builder + auth *libauth.Auth + app *fiber.App +} + +// Embed view +// +//go:embed view/* +var embedDirView embed.FS + +// Embed static +// +//go:embed static/* +var embedDirStatic embed.FS + +func NewAngelaWeb( + auth *libauth.Auth, + t *biztiphereth.Tiphereth, + userCountCache *libcache.Key[model.UserCount], +) *AngelaWeb { + viewsEngine := html.NewFileSystem(http.FS(embedDirView), ".html") + viewsEngine.Directory = "view" + + app := fiber.New(fiber.Config{ //nolint:exhaustruct // no need + Views: viewsEngine, + ViewsLayout: "layout/default", + }) + + app.Use(logger.New()) + + res := &AngelaWeb{ + apiHandler: api.NewHandler(t, userCountCache), + pageBuilder: page.NewBuilder(t, userCountCache), + auth: auth, + app: app, + } + res.setupRoutes() + return res +} + +func (a *AngelaWeb) Start(ctx context.Context) error { + return a.app.Listen(":3000") +} + +func (a *AngelaWeb) Stop(ctx context.Context) error { + return a.app.ShutdownWithContext(ctx) +} diff --git a/internal/service/angelaweb/internal/api/handler.go b/internal/service/angelaweb/internal/api/handler.go new file mode 100644 index 00000000..7bcdd3ee --- /dev/null +++ b/internal/service/angelaweb/internal/api/handler.go @@ -0,0 +1,34 @@ +package api + +import ( + "net/http" + + "github.com/tuihub/librarian/internal/biz/biztiphereth" + "github.com/tuihub/librarian/internal/lib/libcache" + "github.com/tuihub/librarian/internal/model" + + "github.com/gofiber/fiber/v2" +) + +type Handler struct { + t *biztiphereth.Tiphereth + userCountCache *libcache.Key[model.UserCount] +} + +func NewHandler( + t *biztiphereth.Tiphereth, + userCountCache *libcache.Key[model.UserCount], +) *Handler { + return &Handler{ + t: t, + userCountCache: userCountCache, + } +} + +func (h *Handler) GetDashboardStats(c *fiber.Ctx) error { + userCount, err := h.userCountCache.Get(c.UserContext()) + if err != nil { + return c.Status(http.StatusInternalServerError).JSON(fiber.Map{"message": "Error fetching stats"}) + } + return c.JSON(fiber.Map{"user_count": userCount.Count}) +} diff --git a/internal/service/angelaweb/internal/api/login.go b/internal/service/angelaweb/internal/api/login.go new file mode 100644 index 00000000..728f0cd6 --- /dev/null +++ b/internal/service/angelaweb/internal/api/login.go @@ -0,0 +1,34 @@ +package api + +import ( + "net/http" + "time" + + "github.com/tuihub/librarian/internal/lib/libtime" + + "github.com/gofiber/fiber/v2" +) + +func (h *Handler) Login(c *fiber.Ctx) error { + var req LoginRequest + if err := c.BodyParser(&req); err != nil { + return c.Status(http.StatusBadRequest).JSON(fiber.Map{"message": "Invalid request"}) + } + + accessToken, _, err := h.t.GetToken(c.UserContext(), req.Username, req.Password, nil) + if err != nil { + return c.Status(http.StatusInternalServerError).JSON(fiber.Map{"message": err.Message}) + } + + c.Cookie(&fiber.Cookie{ //nolint:exhaustruct // no need + Name: "access_token", + Value: string(accessToken), + Expires: time.Now().Add(libtime.Day), + HTTPOnly: true, + Secure: true, + SameSite: "strict", + Path: "/", + }) + + return c.JSON(LoginResponse{}) +} diff --git a/internal/service/angelaweb/internal/api/model.go b/internal/service/angelaweb/internal/api/model.go new file mode 100644 index 00000000..6e153397 --- /dev/null +++ b/internal/service/angelaweb/internal/api/model.go @@ -0,0 +1,8 @@ +package api + +type LoginRequest struct { + Username string `json:"username"` + Password string `json:"password"` +} + +type LoginResponse struct{} diff --git a/internal/service/angelaweb/internal/api/user.go b/internal/service/angelaweb/internal/api/user.go new file mode 100644 index 00000000..4dba14e2 --- /dev/null +++ b/internal/service/angelaweb/internal/api/user.go @@ -0,0 +1,97 @@ +package api + +import ( + "net/http" + "strconv" + + "github.com/tuihub/librarian/internal/model" + + "github.com/gofiber/fiber/v2" + "github.com/samber/lo" +) + +func (h *Handler) ListUsers(c *fiber.Ctx) error { + // Parse pagination parameters from query string + pageNum, err := strconv.Atoi(c.Query("page", "1")) + if err != nil || pageNum < 1 { + pageNum = 1 + } + + pageSize, err := strconv.Atoi(c.Query("pageSize", "10")) + if err != nil || pageSize < 1 { + pageSize = 10 + } + + users, total, err := h.t.ListUsers(c.UserContext(), model.Paging{ + PageNum: int64(pageNum), + PageSize: int64(pageSize), + }, nil, nil) + + if err != nil { + return c.Status(http.StatusInternalServerError).JSON(fiber.Map{"message": "Error fetching users"}) + } + + // Calculate pagination information + totalPages := (int(total) + pageSize - 1) / pageSize + if totalPages == 0 { + totalPages = 1 + } + + return c.JSON(fiber.Map{ + "users": users, + "pagination": fiber.Map{ + "currentPage": pageNum, + "totalPages": totalPages, + "totalItems": total, + "pageSize": pageSize, + }, + }) +} + +func (h *Handler) GetUser(c *fiber.Ctx) error { + idStr := c.Params("id") + id, err := strconv.ParseInt(idStr, 10, 64) + if err != nil { + return c.Status(http.StatusBadRequest).JSON(fiber.Map{"message": "Invalid ID"}) + } + user, err := h.t.GetUser(c.UserContext(), lo.ToPtr(model.InternalID(id))) + if err != nil { + return c.Status(http.StatusNotFound).JSON(fiber.Map{"message": "User not found"}) + } + return c.JSON(user) +} + +func (h *Handler) CreateUser(c *fiber.Ctx) error { + var user *model.User + if err := c.BodyParser(user); err != nil { + return c.Status(http.StatusBadRequest).JSON(fiber.Map{"message": "Invalid request"}) + } + + var err error + user, err = h.t.CreateUser(c.UserContext(), user) + if err != nil { + return c.Status(http.StatusInternalServerError).JSON(fiber.Map{"message": err.Error()}) + } + + return c.JSON(user) +} + +func (h *Handler) UpdateUser(c *fiber.Ctx) error { + idStr := c.Params("id") + id, err := strconv.ParseInt(idStr, 10, 64) + if err != nil { + return c.Status(http.StatusBadRequest).JSON(fiber.Map{"message": "Invalid ID"}) + } + var user model.User + if err = c.BodyParser(&user); err != nil { + return c.Status(http.StatusBadRequest).JSON(fiber.Map{"message": "Invalid request"}) + } + user.ID = model.InternalID(id) + + err = h.t.UpdateUser(c.UserContext(), &user, "") + if err != nil { + return c.Status(http.StatusInternalServerError).JSON(fiber.Map{"message": err.Error()}) + } + + return c.JSON(user) +} diff --git a/internal/service/angelaweb/internal/page/page.go b/internal/service/angelaweb/internal/page/page.go new file mode 100644 index 00000000..78c3e03d --- /dev/null +++ b/internal/service/angelaweb/internal/page/page.go @@ -0,0 +1,116 @@ +package page + +import ( + "net/http" + "strconv" + + "github.com/tuihub/librarian/internal/biz/biztiphereth" + "github.com/tuihub/librarian/internal/lib/libcache" + "github.com/tuihub/librarian/internal/model" + + "github.com/gofiber/fiber/v2" + "github.com/samber/lo" +) + +type Builder struct { + t *biztiphereth.Tiphereth + userCountCache *libcache.Key[model.UserCount] +} + +func NewBuilder( + t *biztiphereth.Tiphereth, + userCountCache *libcache.Key[model.UserCount], +) *Builder { + return &Builder{ + t: t, + userCountCache: userCountCache, + } +} + +func (b *Builder) Login(c *fiber.Ctx) error { + return c.Render("login", fiber.Map{ + "Title": "登录", + }) +} + +func (b *Builder) Dashboard(c *fiber.Ctx) error { + userCount, err := b.userCountCache.Get(c.UserContext()) + if err != nil { + return c.Status(http.StatusInternalServerError).SendString("Error fetching dashboard data") + } + + return c.Render("dashboard", fiber.Map{ + "Title": "Dashboard", + "UserCount": userCount.Count, + }) +} + +func (b *Builder) UserList(c *fiber.Ctx) error { + pageNum, err := strconv.Atoi(c.Query("page", "1")) + if err != nil || pageNum < 1 { + pageNum = 10 + } + + pageSize := 1 // Users per page + + users, total, err := b.t.ListUsers(c.UserContext(), model.Paging{ + PageNum: int64(pageNum), + PageSize: int64(pageSize), + }, nil, nil) + + if err != nil { + return c.Status(http.StatusInternalServerError).SendString("Error fetching users") + } + + // Calculate pagination information + totalPages := (int(total) + pageSize - 1) / pageSize + if totalPages == 0 { + totalPages = 1 + } + + return c.Render("user", fiber.Map{ + "Title": "用户管理", + "Users": users, + "Pagination": fiber.Map{ + "CurrentPage": pageNum, + "TotalPages": totalPages, + "HasPrev": pageNum > 1, + "HasNext": pageNum < totalPages, + "PrevPage": pageNum - 1, + "NextPage": pageNum + 1, + }, + }) +} + +func (b *Builder) UserForm(c *fiber.Ctx) error { + idStr := c.Params("id") + var user *model.User + var title string + var action string + var method string + + if idStr != "" { + id, err := strconv.ParseInt(idStr, 10, 64) + if err != nil { + return c.Status(http.StatusBadRequest).SendString("Invalid ID") + } + user, err = b.t.GetUser(c.UserContext(), lo.ToPtr(model.InternalID(id))) + if err != nil { + return c.Status(http.StatusNotFound).SendString("User not found") + } + title = "编辑用户" + action = "/api/users/" + idStr + method = "PUT" + } else { + title = "创建用户" + action = "/api/users" + method = "POST" + } + + return c.Render("user_form", fiber.Map{ + "Title": title, + "User": user, + "Action": action, + "Method": method, + }) +} diff --git a/internal/service/angelaweb/routes.go b/internal/service/angelaweb/routes.go new file mode 100644 index 00000000..0b4b0a92 --- /dev/null +++ b/internal/service/angelaweb/routes.go @@ -0,0 +1,45 @@ +package angelaweb + +import ( + "net/http" + + "github.com/gofiber/fiber/v2/middleware/cors" + "github.com/gofiber/fiber/v2/middleware/filesystem" +) + +func (a *AngelaWeb) setupRoutes() { + // 静态文件 + a.app.Use("/static", filesystem.New(filesystem.Config{ //nolint: exhaustruct // no need + Root: http.FS(embedDirStatic), + PathPrefix: "static", + Browse: true, + })) + + // CORS + a.app.Use(cors.New()) + + // API路由 + api := a.app.Group("/api") + api.Post("/login", a.apiHandler.Login) + + api.Use(tokenMiddleware(a.auth)) + + // 受保护的API路由 + api.Get("/users", a.apiHandler.ListUsers) + api.Post("/users", a.apiHandler.CreateUser) + api.Get("/users/:id", a.apiHandler.GetUser) + api.Put("/users/:id", a.apiHandler.UpdateUser) + api.Get("/dashboard/stats", a.apiHandler.GetDashboardStats) + + // 页面路由 + a.app.Get("/login", a.pageBuilder.Login) + + // 受保护的页面路由 + auth := a.app.Group("/") + auth.Use(tokenMiddleware(a.auth)) + + auth.Get("/", a.pageBuilder.Dashboard) + auth.Get("/users", a.pageBuilder.UserList) + auth.Get("/users/new", a.pageBuilder.UserForm) + auth.Get("/users/edit/:id", a.pageBuilder.UserForm) +} diff --git a/internal/service/angelaweb/static/css/style.css b/internal/service/angelaweb/static/css/style.css new file mode 100644 index 00000000..3497c985 --- /dev/null +++ b/internal/service/angelaweb/static/css/style.css @@ -0,0 +1,3 @@ +.custom-shadow { + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); +} \ No newline at end of file diff --git a/internal/service/angelaweb/token_middleware.go b/internal/service/angelaweb/token_middleware.go new file mode 100644 index 00000000..01dc0ab6 --- /dev/null +++ b/internal/service/angelaweb/token_middleware.go @@ -0,0 +1,23 @@ +package angelaweb + +import ( + "github.com/tuihub/librarian/internal/lib/libauth" + + "github.com/go-kratos/kratos/v2/middleware/auth/jwt" + "github.com/gofiber/fiber/v2" +) + +func tokenMiddleware(auth *libauth.Auth) fiber.Handler { + return func(c *fiber.Ctx) error { + accessToken := c.Cookies("access_token") + claims, err := libauth.FromString(accessToken, auth.KeyFunc(libauth.ClaimsTypeAccessToken)) + if err != nil { + return err + } + ctx := c.UserContext() + ctx = libauth.RawToContext(ctx, c.Cookies("access_token")) + ctx = jwt.NewContext(ctx, claims) + c.SetUserContext(ctx) + return c.Next() + } +} diff --git a/internal/service/angelaweb/view/dashboard.html b/internal/service/angelaweb/view/dashboard.html new file mode 100644 index 00000000..6d79aed2 --- /dev/null +++ b/internal/service/angelaweb/view/dashboard.html @@ -0,0 +1,21 @@ +
+

系统概览

+
+
+

用户总数

+

{{.UserCount}}

+
+
+
+ +
+

快速操作

+
+ + 查看用户列表 + + + 创建新用户 + +
+
\ No newline at end of file diff --git a/internal/service/angelaweb/view/layout/default.html b/internal/service/angelaweb/view/layout/default.html new file mode 100644 index 00000000..087bb8be --- /dev/null +++ b/internal/service/angelaweb/view/layout/default.html @@ -0,0 +1,30 @@ + + + + + + {{.Title}} + + + +
+ +
+
+

用户管理系统

+ +
+
+ + +
+
+ {{embed}} +
+
+
+ + \ No newline at end of file diff --git a/internal/service/angelaweb/view/login.html b/internal/service/angelaweb/view/login.html new file mode 100644 index 00000000..18563d5b --- /dev/null +++ b/internal/service/angelaweb/view/login.html @@ -0,0 +1,67 @@ +
+
+

登录系统

+
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/internal/service/angelaweb/view/user.html b/internal/service/angelaweb/view/user.html new file mode 100644 index 00000000..c3156412 --- /dev/null +++ b/internal/service/angelaweb/view/user.html @@ -0,0 +1,143 @@ +
+

用户列表

+ + 添加用户 + +
+ +
+ + + + + + + + + + + {{range .Users}} + + + + + + + {{else}} + + + + {{end}} + +
ID用户名角色操作
{{.ID}}{{.Username}} + {{if eq .Type 1}} + 管理员 + {{else}} + 普通用户 + {{end}} + +
+ + 编辑 + + +
+
暂无用户数据
+
+ + +{{if .Pagination}} +
+
+ 第 {{.Pagination.CurrentPage}} 页，共 {{.Pagination.TotalPages}} 页 +
+
+ {{if .Pagination.HasPrev}} + + 上一页 + + {{else}} + + {{end}} + + {{if .Pagination.HasNext}} + + 下一页 + + {{else}} + + {{end}} +
+
+{{end}} + + + + + \ No newline at end of file diff --git a/internal/service/angelaweb/view/user_form.html b/internal/service/angelaweb/view/user_form.html new file mode 100644 index 00000000..03f6eb46 --- /dev/null +++ b/internal/service/angelaweb/view/user_form.html @@ -0,0 +1,101 @@ +
+

+ {{if .User.ID}}编辑用户{{else}}创建新用户{{end}} +

+
+ +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+
+ +
+ + 返回列表 + + +
+
+ + \ No newline at end of file diff --git a/app/sephirah/internal/service/binah.go b/internal/service/sephirah/binah.go similarity index 99% rename from app/sephirah/internal/service/binah.go rename to internal/service/sephirah/binah.go index dd0399c3..29c13405 100644 --- a/app/sephirah/internal/service/binah.go +++ b/internal/service/sephirah/binah.go @@ -1,4 +1,4 @@ -package service +package sephirah import ( "context" diff --git a/app/sephirah/internal/service/chesed.go b/internal/service/sephirah/chesed.go similarity index 93% rename from app/sephirah/internal/service/chesed.go rename to internal/service/sephirah/chesed.go index b0a12096..578c2740 100644 --- a/app/sephirah/internal/service/chesed.go +++ b/internal/service/sephirah/chesed.go @@ -1,11 +1,11 @@ -package service +package sephirah import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelchesed" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelchesed" + "github.com/tuihub/librarian/internal/service/sephirah/converter" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" librarian "github.com/tuihub/protos/pkg/librarian/v1" diff --git a/app/sephirah/internal/model/converter/biz_to_pb.go b/internal/service/sephirah/converter/biz_to_pb.go similarity index 91% rename from app/sephirah/internal/model/converter/biz_to_pb.go rename to internal/service/sephirah/converter/biz_to_pb.go index 16afe5e6..7e60f402 100644 --- a/app/sephirah/internal/model/converter/biz_to_pb.go +++ b/internal/service/sephirah/converter/biz_to_pb.go @@ -3,14 +3,12 @@ package converter import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" - "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/model" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/model/modelyesod" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" librarian "github.com/tuihub/protos/pkg/librarian/v1" @@ -21,7 +19,7 @@ import ( // goverter:converter // goverter:output:format function // goverter:output:file ./generated.go -// goverter:output:package github.com/tuihub/librarian/app/sephirah/internal/model/converter +// goverter:output:package github.com/tuihub/librarian/internal/service/sephirah/converter // goverter:matchIgnoreCase // goverter:ignoreUnexported // goverter:extend ToPBInternalID @@ -37,8 +35,8 @@ type toPBConverter interface { //nolint:unused // used by generator ToPBFeatureRequest(*modelsupervisor.FeatureRequest) *librarian.FeatureRequest // goverter:map ID DeviceId - ToPBDeviceInfo(*modeltiphereth.DeviceInfo) *pb.DeviceInfo - ToPBDeviceInfoList([]*modeltiphereth.DeviceInfo) []*pb.DeviceInfo + ToPBDeviceInfo(*model.DeviceInfo) *pb.DeviceInfo + ToPBDeviceInfoList([]*model.DeviceInfo) []*pb.DeviceInfo // goverter:enum:unknown SystemType_SYSTEM_TYPE_UNSPECIFIED // goverter:enum:map SystemTypeUnspecified SystemType_SYSTEM_TYPE_UNSPECIFIED // goverter:enum:map SystemTypeIOS SystemType_SYSTEM_TYPE_IOS @@ -47,31 +45,31 @@ type toPBConverter interface { //nolint:unused // used by generator // goverter:enum:map SystemTypeWindows SystemType_SYSTEM_TYPE_WINDOWS // goverter:enum:map SystemTypeMacOS SystemType_SYSTEM_TYPE_MACOS // goverter:enum:map SystemTypeLinux SystemType_SYSTEM_TYPE_LINUX - ToPBSystemType(modeltiphereth.SystemType) pb.SystemType + ToPBSystemType(model.SystemType) pb.SystemType // goverter:map CreateAt CreateTime // goverter:map ExpireAt ExpireTime - ToPBUserSession(*modeltiphereth.UserSession) *pb.UserSession - ToPBUserSessionList([]*modeltiphereth.UserSession) []*pb.UserSession + ToPBUserSession(*model.UserSession) *pb.UserSession + ToPBUserSessionList([]*model.UserSession) []*pb.UserSession // goverter:ignore Password - ToPBUser(*modeltiphereth.User) *pb.User - ToPBUserList([]*modeltiphereth.User) []*pb.User + ToPBUser(*model.User) *pb.User + ToPBUserList([]*model.User) []*pb.User // goverter:enum:unknown UserType_USER_TYPE_UNSPECIFIED // goverter:enum:map UserTypeUnspecified UserType_USER_TYPE_UNSPECIFIED // goverter:enum:map UserTypeAdmin UserType_USER_TYPE_ADMIN // goverter:enum:map UserTypeNormal UserType_USER_TYPE_NORMAL // goverter:enum:map UserTypeSentinel UserType_USER_TYPE_SENTINEL // goverter:enum:map UserTypePorter UserType_USER_TYPE_PORTER - ToPBUserType(libauth.UserType) pb.UserType + ToPBUserType(model.UserType) pb.UserType // goverter:enum:unknown UserStatus_USER_STATUS_UNSPECIFIED // goverter:enum:map UserStatusUnspecified UserStatus_USER_STATUS_UNSPECIFIED // goverter:enum:map UserStatusActive UserStatus_USER_STATUS_ACTIVE // goverter:enum:map UserStatusBlocked UserStatus_USER_STATUS_BLOCKED - ToPBUserStatus(modeltiphereth.UserStatus) pb.UserStatus + ToPBUserStatus(model.UserStatus) pb.UserStatus - ToPBAccount(*modeltiphereth.Account) *librarian.Account - ToPBAccountList([]*modeltiphereth.Account) []*librarian.Account + ToPBAccount(*model.Account) *librarian.Account + ToPBAccountList([]*model.Account) []*librarian.Account // goverter:autoMap PorterInstance ToPBPorter(*modelsupervisor.PorterInstanceController) *pb.Porter diff --git a/app/sephirah/internal/model/converter/converter.go b/internal/service/sephirah/converter/converter.go similarity index 100% rename from app/sephirah/internal/model/converter/converter.go rename to internal/service/sephirah/converter/converter.go diff --git a/app/sephirah/internal/model/converter/generated.go b/internal/service/sephirah/converter/generated.go old mode 100755 new mode 100644 similarity index 93% rename from app/sephirah/internal/model/converter/generated.go rename to internal/service/sephirah/converter/generated.go index b4294f01..c926ec45 --- a/app/sephirah/internal/model/converter/generated.go +++ b/internal/service/sephirah/converter/generated.go @@ -4,15 +4,13 @@ package converter import ( - modelbinah "github.com/tuihub/librarian/app/sephirah/internal/model/modelbinah" - modelgebura "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - modelnetzach "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - modelsupervisor "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - modeltiphereth "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - modelyesod "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" - libauth "github.com/tuihub/librarian/internal/lib/libauth" model "github.com/tuihub/librarian/internal/model" + modelbinah "github.com/tuihub/librarian/internal/model/modelbinah" modelfeed "github.com/tuihub/librarian/internal/model/modelfeed" + modelgebura "github.com/tuihub/librarian/internal/model/modelgebura" + modelnetzach "github.com/tuihub/librarian/internal/model/modelnetzach" + modelsupervisor "github.com/tuihub/librarian/internal/model/modelsupervisor" + modelyesod "github.com/tuihub/librarian/internal/model/modelyesod" v11 "github.com/tuihub/protos/pkg/librarian/sephirah/v1" v1 "github.com/tuihub/protos/pkg/librarian/v1" timestamppb "google.golang.org/protobuf/types/known/timestamppb" @@ -164,20 +162,20 @@ func ToBizAppTypeList(source []v1.AppType) []modelgebura.AppType { } return modelgeburaAppTypeList } -func ToBizDeviceInfo(source *v11.DeviceInfo) *modeltiphereth.DeviceInfo { - var pModeltipherethDeviceInfo *modeltiphereth.DeviceInfo +func ToBizDeviceInfo(source *v11.DeviceInfo) *model.DeviceInfo { + var pModelDeviceInfo *model.DeviceInfo if source != nil { - var modeltipherethDeviceInfo modeltiphereth.DeviceInfo - modeltipherethDeviceInfo.ID = ToBizInternalID((*source).DeviceId) - modeltipherethDeviceInfo.DeviceName = (*source).DeviceName - modeltipherethDeviceInfo.SystemType = ToBizSystemType((*source).SystemType) - modeltipherethDeviceInfo.SystemVersion = (*source).SystemVersion - modeltipherethDeviceInfo.ClientName = (*source).ClientName - modeltipherethDeviceInfo.ClientSourceCodeAddress = (*source).ClientSourceCodeAddress - modeltipherethDeviceInfo.ClientVersion = (*source).ClientVersion - pModeltipherethDeviceInfo = &modeltipherethDeviceInfo + var modelDeviceInfo model.DeviceInfo + modelDeviceInfo.ID = ToBizInternalID((*source).DeviceId) + modelDeviceInfo.DeviceName = (*source).DeviceName + modelDeviceInfo.SystemType = ToBizSystemType((*source).SystemType) + modelDeviceInfo.SystemVersion = (*source).SystemVersion + modelDeviceInfo.ClientName = (*source).ClientName + modelDeviceInfo.ClientSourceCodeAddress = (*source).ClientSourceCodeAddress + modelDeviceInfo.ClientVersion = (*source).ClientVersion + pModelDeviceInfo = &modelDeviceInfo } - return pModeltipherethDeviceInfo + return pModelDeviceInfo } func ToBizFeatureFlag(source *v1.FeatureFlag) *modelsupervisor.FeatureFlag { var pModelsupervisorFeatureFlag *modelsupervisor.FeatureFlag @@ -679,27 +677,27 @@ func ToBizSystemNotificationTypeList(source []v11.SystemNotificationType) []mode } return modelnetzachSystemNotificationTypeList } -func ToBizSystemType(source v11.SystemType) modeltiphereth.SystemType { - var modeltipherethSystemType modeltiphereth.SystemType +func ToBizSystemType(source v11.SystemType) model.SystemType { + var modelSystemType model.SystemType switch source { case v11.SystemType_SYSTEM_TYPE_ANDROID: - modeltipherethSystemType = modeltiphereth.SystemTypeAndroid + modelSystemType = model.SystemTypeAndroid case v11.SystemType_SYSTEM_TYPE_IOS: - modeltipherethSystemType = modeltiphereth.SystemTypeIOS + modelSystemType = model.SystemTypeIOS case v11.SystemType_SYSTEM_TYPE_LINUX: - modeltipherethSystemType = modeltiphereth.SystemTypeLinux + modelSystemType = model.SystemTypeLinux case v11.SystemType_SYSTEM_TYPE_MACOS: - modeltipherethSystemType = modeltiphereth.SystemTypeMacOS + modelSystemType = model.SystemTypeMacOS case v11.SystemType_SYSTEM_TYPE_UNSPECIFIED: - modeltipherethSystemType = modeltiphereth.SystemTypeUnspecified + modelSystemType = model.SystemTypeUnspecified case v11.SystemType_SYSTEM_TYPE_WEB: - modeltipherethSystemType = modeltiphereth.SystemTypeWeb + modelSystemType = model.SystemTypeWeb case v11.SystemType_SYSTEM_TYPE_WINDOWS: - modeltipherethSystemType = modeltiphereth.SystemTypeWindows + modelSystemType = model.SystemTypeWindows default: - modeltipherethSystemType = modeltiphereth.SystemTypeUnspecified + modelSystemType = model.SystemTypeUnspecified } - return modeltipherethSystemType + return modelSystemType } func ToBizTimeRange(source *v1.TimeRange) *model.TimeRange { var pModelTimeRange *model.TimeRange @@ -711,70 +709,70 @@ func ToBizTimeRange(source *v1.TimeRange) *model.TimeRange { } return pModelTimeRange } -func ToBizUser(source *v11.User) *modeltiphereth.User { - var pModeltipherethUser *modeltiphereth.User +func ToBizUser(source *v11.User) *model.User { + var pModelUser *model.User if source != nil { - var modeltipherethUser modeltiphereth.User - modeltipherethUser.ID = ToBizInternalID((*source).Id) - modeltipherethUser.UserName = (*source).Username - modeltipherethUser.PassWord = (*source).Password - modeltipherethUser.Type = ToLibAuthUserType((*source).Type) - modeltipherethUser.Status = ToBizUserStatus((*source).Status) - pModeltipherethUser = &modeltipherethUser + var modelUser model.User + modelUser.ID = ToBizInternalID((*source).Id) + modelUser.Username = (*source).Username + modelUser.Password = (*source).Password + modelUser.Type = ToLibAuthUserType((*source).Type) + modelUser.Status = ToBizUserStatus((*source).Status) + pModelUser = &modelUser } - return pModeltipherethUser + return pModelUser } -func ToBizUserStatus(source v11.UserStatus) modeltiphereth.UserStatus { - var modeltipherethUserStatus modeltiphereth.UserStatus +func ToBizUserStatus(source v11.UserStatus) model.UserStatus { + var modelUserStatus model.UserStatus switch source { case v11.UserStatus_USER_STATUS_ACTIVE: - modeltipherethUserStatus = modeltiphereth.UserStatusActive + modelUserStatus = model.UserStatusActive case v11.UserStatus_USER_STATUS_BLOCKED: - modeltipherethUserStatus = modeltiphereth.UserStatusBlocked + modelUserStatus = model.UserStatusBlocked case v11.UserStatus_USER_STATUS_UNSPECIFIED: - modeltipherethUserStatus = modeltiphereth.UserStatusUnspecified + modelUserStatus = model.UserStatusUnspecified default: - modeltipherethUserStatus = modeltiphereth.UserStatusUnspecified + modelUserStatus = model.UserStatusUnspecified } - return modeltipherethUserStatus + return modelUserStatus } -func ToBizUserStatusList(source []v11.UserStatus) []modeltiphereth.UserStatus { - var modeltipherethUserStatusList []modeltiphereth.UserStatus +func ToBizUserStatusList(source []v11.UserStatus) []model.UserStatus { + var modelUserStatusList []model.UserStatus if source != nil { - modeltipherethUserStatusList = make([]modeltiphereth.UserStatus, len(source)) + modelUserStatusList = make([]model.UserStatus, len(source)) for i := 0; i < len(source); i++ { - modeltipherethUserStatusList[i] = ToBizUserStatus(source[i]) + modelUserStatusList[i] = ToBizUserStatus(source[i]) } } - return modeltipherethUserStatusList + return modelUserStatusList } -func ToLibAuthUserType(source v11.UserType) libauth.UserType { - var libauthUserType libauth.UserType +func ToLibAuthUserType(source v11.UserType) model.UserType { + var modelUserType model.UserType switch source { case v11.UserType_USER_TYPE_ADMIN: - libauthUserType = libauth.UserTypeAdmin + modelUserType = model.UserTypeAdmin case v11.UserType_USER_TYPE_NORMAL: - libauthUserType = libauth.UserTypeNormal + modelUserType = model.UserTypeNormal case v11.UserType_USER_TYPE_PORTER: - libauthUserType = libauth.UserTypePorter + modelUserType = model.UserTypePorter case v11.UserType_USER_TYPE_SENTINEL: - libauthUserType = libauth.UserTypeSentinel + modelUserType = model.UserTypeSentinel case v11.UserType_USER_TYPE_UNSPECIFIED: - libauthUserType = libauth.UserTypeUnspecified + modelUserType = model.UserTypeUnspecified default: - libauthUserType = libauth.UserTypeUnspecified + modelUserType = model.UserTypeUnspecified } - return libauthUserType + return modelUserType } -func ToLibAuthUserTypeList(source []v11.UserType) []libauth.UserType { - var libauthUserTypeList []libauth.UserType +func ToLibAuthUserTypeList(source []v11.UserType) []model.UserType { + var modelUserTypeList []model.UserType if source != nil { - libauthUserTypeList = make([]libauth.UserType, len(source)) + modelUserTypeList = make([]model.UserType, len(source)) for i := 0; i < len(source); i++ { - libauthUserTypeList[i] = ToLibAuthUserType(source[i]) + modelUserTypeList[i] = ToLibAuthUserType(source[i]) } } - return libauthUserTypeList + return modelUserTypeList } func pTimestamppbTimestampToPTimeTime(source *timestamppb.Timestamp) *time.Time { var pTimeTime *time.Time @@ -816,7 +814,7 @@ func pV1FeedPersonToPModelfeedPerson(source *v1.FeedPerson) *modelfeed.Person { } return pModelfeedPerson } -func ToPBAccount(source *modeltiphereth.Account) *v1.Account { +func ToPBAccount(source *model.Account) *v1.Account { var pV1Account *v1.Account if source != nil { var v1Account v1.Account @@ -831,7 +829,7 @@ func ToPBAccount(source *modeltiphereth.Account) *v1.Account { } return pV1Account } -func ToPBAccountList(source []*modeltiphereth.Account) []*v1.Account { +func ToPBAccountList(source []*model.Account) []*v1.Account { var pV1AccountList []*v1.Account if source != nil { pV1AccountList = make([]*v1.Account, len(source)) @@ -976,7 +974,7 @@ func ToPBAppType(source modelgebura.AppType) v1.AppType { } return v1AppType } -func ToPBDeviceInfo(source *modeltiphereth.DeviceInfo) *v11.DeviceInfo { +func ToPBDeviceInfo(source *model.DeviceInfo) *v11.DeviceInfo { var pV1DeviceInfo *v11.DeviceInfo if source != nil { var v1DeviceInfo v11.DeviceInfo @@ -991,7 +989,7 @@ func ToPBDeviceInfo(source *modeltiphereth.DeviceInfo) *v11.DeviceInfo { } return pV1DeviceInfo } -func ToPBDeviceInfoList(source []*modeltiphereth.DeviceInfo) []*v11.DeviceInfo { +func ToPBDeviceInfoList(source []*model.DeviceInfo) []*v11.DeviceInfo { var pV1DeviceInfoList []*v11.DeviceInfo if source != nil { pV1DeviceInfoList = make([]*v11.DeviceInfo, len(source)) @@ -1606,22 +1604,22 @@ func ToPBSystemNotificationType(source modelnetzach.SystemNotificationType) v11. } return v1SystemNotificationType } -func ToPBSystemType(source modeltiphereth.SystemType) v11.SystemType { +func ToPBSystemType(source model.SystemType) v11.SystemType { var v1SystemType v11.SystemType switch source { - case modeltiphereth.SystemTypeAndroid: + case model.SystemTypeAndroid: v1SystemType = v11.SystemType_SYSTEM_TYPE_ANDROID - case modeltiphereth.SystemTypeIOS: + case model.SystemTypeIOS: v1SystemType = v11.SystemType_SYSTEM_TYPE_IOS - case modeltiphereth.SystemTypeLinux: + case model.SystemTypeLinux: v1SystemType = v11.SystemType_SYSTEM_TYPE_LINUX - case modeltiphereth.SystemTypeMacOS: + case model.SystemTypeMacOS: v1SystemType = v11.SystemType_SYSTEM_TYPE_MACOS - case modeltiphereth.SystemTypeUnspecified: + case model.SystemTypeUnspecified: v1SystemType = v11.SystemType_SYSTEM_TYPE_UNSPECIFIED - case modeltiphereth.SystemTypeWeb: + case model.SystemTypeWeb: v1SystemType = v11.SystemType_SYSTEM_TYPE_WEB - case modeltiphereth.SystemTypeWindows: + case model.SystemTypeWindows: v1SystemType = v11.SystemType_SYSTEM_TYPE_WINDOWS default: v1SystemType = v11.SystemType_SYSTEM_TYPE_UNSPECIFIED @@ -1638,19 +1636,19 @@ func ToPBTimeRange(source *model.TimeRange) *v1.TimeRange { } return pV1TimeRange } -func ToPBUser(source *modeltiphereth.User) *v11.User { +func ToPBUser(source *model.User) *v11.User { var pV1User *v11.User if source != nil { var v1User v11.User v1User.Id = ToPBInternalID((*source).ID) - v1User.Username = (*source).UserName + v1User.Username = (*source).Username v1User.Type = ToPBUserType((*source).Type) v1User.Status = ToPBUserStatus((*source).Status) pV1User = &v1User } return pV1User } -func ToPBUserList(source []*modeltiphereth.User) []*v11.User { +func ToPBUserList(source []*model.User) []*v11.User { var pV1UserList []*v11.User if source != nil { pV1UserList = make([]*v11.User, len(source)) @@ -1660,7 +1658,7 @@ func ToPBUserList(source []*modeltiphereth.User) []*v11.User { } return pV1UserList } -func ToPBUserSession(source *modeltiphereth.UserSession) *v11.UserSession { +func ToPBUserSession(source *model.UserSession) *v11.UserSession { var pV1UserSession *v11.UserSession if source != nil { var v1UserSession v11.UserSession @@ -1673,7 +1671,7 @@ func ToPBUserSession(source *modeltiphereth.UserSession) *v11.UserSession { } return pV1UserSession } -func ToPBUserSessionList(source []*modeltiphereth.UserSession) []*v11.UserSession { +func ToPBUserSessionList(source []*model.UserSession) []*v11.UserSession { var pV1UserSessionList []*v11.UserSession if source != nil { pV1UserSessionList = make([]*v11.UserSession, len(source)) @@ -1683,32 +1681,32 @@ func ToPBUserSessionList(source []*modeltiphereth.UserSession) []*v11.UserSessio } return pV1UserSessionList } -func ToPBUserStatus(source modeltiphereth.UserStatus) v11.UserStatus { +func ToPBUserStatus(source model.UserStatus) v11.UserStatus { var v1UserStatus v11.UserStatus switch source { - case modeltiphereth.UserStatusActive: + case model.UserStatusActive: v1UserStatus = v11.UserStatus_USER_STATUS_ACTIVE - case modeltiphereth.UserStatusBlocked: + case model.UserStatusBlocked: v1UserStatus = v11.UserStatus_USER_STATUS_BLOCKED - case modeltiphereth.UserStatusUnspecified: + case model.UserStatusUnspecified: v1UserStatus = v11.UserStatus_USER_STATUS_UNSPECIFIED default: v1UserStatus = v11.UserStatus_USER_STATUS_UNSPECIFIED } return v1UserStatus } -func ToPBUserType(source libauth.UserType) v11.UserType { +func ToPBUserType(source model.UserType) v11.UserType { var v1UserType v11.UserType switch source { - case libauth.UserTypeAdmin: + case model.UserTypeAdmin: v1UserType = v11.UserType_USER_TYPE_ADMIN - case libauth.UserTypeNormal: + case model.UserTypeNormal: v1UserType = v11.UserType_USER_TYPE_NORMAL - case libauth.UserTypePorter: + case model.UserTypePorter: v1UserType = v11.UserType_USER_TYPE_PORTER - case libauth.UserTypeSentinel: + case model.UserTypeSentinel: v1UserType = v11.UserType_USER_TYPE_SENTINEL - case libauth.UserTypeUnspecified: + case model.UserTypeUnspecified: v1UserType = v11.UserType_USER_TYPE_UNSPECIFIED default: v1UserType = v11.UserType_USER_TYPE_UNSPECIFIED diff --git a/app/sephirah/internal/model/converter/pb_to_biz.go b/internal/service/sephirah/converter/pb_to_biz.go similarity index 92% rename from app/sephirah/internal/model/converter/pb_to_biz.go rename to internal/service/sephirah/converter/pb_to_biz.go index 0d5b545c..24ec7ea6 100644 --- a/app/sephirah/internal/model/converter/pb_to_biz.go +++ b/internal/service/sephirah/converter/pb_to_biz.go @@ -3,15 +3,13 @@ package converter import ( "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelbinah" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelgebura" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelyesod" - "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelbinah" "github.com/tuihub/librarian/internal/model/modelfeed" + "github.com/tuihub/librarian/internal/model/modelgebura" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/model/modelyesod" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" librarian "github.com/tuihub/protos/pkg/librarian/v1" @@ -22,7 +20,7 @@ import ( // goverter:converter // goverter:output:format function // goverter:output:file ./generated.go -// goverter:output:package github.com/tuihub/librarian/app/sephirah/internal/model/converter +// goverter:output:package github.com/tuihub/librarian/internal/service/sephirah/converter // goverter:matchIgnoreCase // goverter:ignoreUnexported // goverter:extend ToBizInternalID @@ -43,7 +41,7 @@ type toBizConverter interface { //nolint:unused // used by generator ToBizInternalIDList([]*librarian.InternalID) []model.InternalID // goverter:map DeviceId ID - ToBizDeviceInfo(*pb.DeviceInfo) *modeltiphereth.DeviceInfo + ToBizDeviceInfo(*pb.DeviceInfo) *model.DeviceInfo // goverter:enum:unknown SystemTypeUnspecified // goverter:enum:map SystemType_SYSTEM_TYPE_UNSPECIFIED SystemTypeUnspecified // goverter:enum:map SystemType_SYSTEM_TYPE_IOS SystemTypeIOS @@ -52,22 +50,22 @@ type toBizConverter interface { //nolint:unused // used by generator // goverter:enum:map SystemType_SYSTEM_TYPE_WINDOWS SystemTypeWindows // goverter:enum:map SystemType_SYSTEM_TYPE_MACOS SystemTypeMacOS // goverter:enum:map SystemType_SYSTEM_TYPE_LINUX SystemTypeLinux - ToBizSystemType(pb.SystemType) modeltiphereth.SystemType - ToBizUser(*pb.User) *modeltiphereth.User + ToBizSystemType(pb.SystemType) model.SystemType + ToBizUser(*pb.User) *model.User // goverter:enum:unknown UserTypeUnspecified // goverter:enum:map UserType_USER_TYPE_UNSPECIFIED UserTypeUnspecified // goverter:enum:map UserType_USER_TYPE_ADMIN UserTypeAdmin // goverter:enum:map UserType_USER_TYPE_NORMAL UserTypeNormal // goverter:enum:map UserType_USER_TYPE_SENTINEL UserTypeSentinel // goverter:enum:map UserType_USER_TYPE_PORTER UserTypePorter - ToLibAuthUserType(pb.UserType) libauth.UserType - ToLibAuthUserTypeList([]pb.UserType) []libauth.UserType - ToBizUserStatusList([]pb.UserStatus) []modeltiphereth.UserStatus + ToLibAuthUserType(pb.UserType) model.UserType + ToLibAuthUserTypeList([]pb.UserType) []model.UserType + ToBizUserStatusList([]pb.UserStatus) []model.UserStatus // goverter:enum:unknown UserStatusUnspecified // goverter:enum:map UserStatus_USER_STATUS_UNSPECIFIED UserStatusUnspecified // goverter:enum:map UserStatus_USER_STATUS_ACTIVE UserStatusActive // goverter:enum:map UserStatus_USER_STATUS_BLOCKED UserStatusBlocked - ToBizUserStatus(pb.UserStatus) modeltiphereth.UserStatus + ToBizUserStatus(pb.UserStatus) model.UserStatus ToBizPorterContext(*pb.PorterContext) *modelsupervisor.PorterContext // goverter:enum:unknown PorterContextStatusUnspecified diff --git a/app/sephirah/internal/service/gebura.go b/internal/service/sephirah/gebura.go similarity index 99% rename from app/sephirah/internal/service/gebura.go rename to internal/service/sephirah/gebura.go index 0d61f28a..d38b5555 100644 --- a/app/sephirah/internal/service/gebura.go +++ b/internal/service/sephirah/gebura.go @@ -1,10 +1,10 @@ -package service +package sephirah import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/service/sephirah/converter" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" librarian "github.com/tuihub/protos/pkg/librarian/v1" diff --git a/app/sephirah/internal/service/librariansephirahservice.go b/internal/service/sephirah/librariansephirahservice.go similarity index 79% rename from app/sephirah/internal/service/librariansephirahservice.go rename to internal/service/sephirah/librariansephirahservice.go index 00cc2dc8..d58cede6 100644 --- a/app/sephirah/internal/service/librariansephirahservice.go +++ b/internal/service/sephirah/librariansephirahservice.go @@ -1,21 +1,21 @@ -package service +package sephirah import ( "context" "time" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizangela" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizbinah" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizchesed" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizgebura" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biznetzach" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biztiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizyesod" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" - "github.com/tuihub/librarian/app/sephirah/internal/supervisor" + "github.com/tuihub/librarian/internal/biz/bizbinah" + "github.com/tuihub/librarian/internal/biz/bizchesed" + "github.com/tuihub/librarian/internal/biz/bizgebura" + "github.com/tuihub/librarian/internal/biz/bizkether" + "github.com/tuihub/librarian/internal/biz/biznetzach" + "github.com/tuihub/librarian/internal/biz/biztiphereth" + "github.com/tuihub/librarian/internal/biz/bizyesod" "github.com/tuihub/librarian/internal/conf" "github.com/tuihub/librarian/internal/lib/libapp" "github.com/tuihub/librarian/internal/lib/libauth" + "github.com/tuihub/librarian/internal/service/sephirah/converter" + "github.com/tuihub/librarian/internal/service/supervisor" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" "google.golang.org/protobuf/types/known/timestamppb" @@ -24,7 +24,7 @@ import ( type LibrarianSephirahServiceService struct { pb.UnimplementedLibrarianSephirahServiceServer - a *bizangela.Angela + a *bizkether.Kether t *biztiphereth.Tiphereth g *bizgebura.Gebura b *bizbinah.Binah @@ -38,7 +38,7 @@ type LibrarianSephirahServiceService struct { } func NewLibrarianSephirahServiceService( - a *bizangela.Angela, + a *bizkether.Kether, t *biztiphereth.Tiphereth, g *bizgebura.Gebura, b *bizbinah.Binah, diff --git a/app/sephirah/internal/service/netzach.go b/internal/service/sephirah/netzach.go similarity index 97% rename from app/sephirah/internal/service/netzach.go rename to internal/service/sephirah/netzach.go index ffd7d525..74036957 100644 --- a/app/sephirah/internal/service/netzach.go +++ b/internal/service/sephirah/netzach.go @@ -1,10 +1,10 @@ -package service +package sephirah import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/service/sephirah/converter" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" librarian "github.com/tuihub/protos/pkg/librarian/v1" ) diff --git a/app/sephirah/internal/service/porter.go b/internal/service/sephirah/porter.go similarity index 88% rename from app/sephirah/internal/service/porter.go rename to internal/service/sephirah/porter.go index a3045905..8ddd37ba 100644 --- a/app/sephirah/internal/service/porter.go +++ b/internal/service/sephirah/porter.go @@ -1,10 +1,10 @@ -package service +package sephirah import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/service/sephirah/converter" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" ) diff --git a/app/sephirah/internal/service/service.go b/internal/service/sephirah/service.go similarity index 88% rename from app/sephirah/internal/service/service.go rename to internal/service/sephirah/service.go index 9c08df1c..36aed3d2 100644 --- a/app/sephirah/internal/service/service.go +++ b/internal/service/sephirah/service.go @@ -1,4 +1,4 @@ -package service +package sephirah import "github.com/google/wire" diff --git a/app/sephirah/internal/service/tiphereth.go b/internal/service/sephirah/tiphereth.go similarity index 95% rename from app/sephirah/internal/service/tiphereth.go rename to internal/service/sephirah/tiphereth.go index 5e6f06eb..91091684 100644 --- a/app/sephirah/internal/service/tiphereth.go +++ b/internal/service/sephirah/tiphereth.go @@ -1,14 +1,13 @@ -package service +package sephirah import ( "context" "time" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" "github.com/tuihub/librarian/internal/lib/logger" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/service/sephirah/converter" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" librarian "github.com/tuihub/protos/pkg/librarian/v1" ) @@ -65,9 +64,9 @@ func (s *LibrarianSephirahServiceService) AcquireUserToken(ctx context.Context, func (s *LibrarianSephirahServiceService) RegisterUser(ctx context.Context, req *pb.RegisterUserRequest) ( *pb.RegisterUserResponse, error, ) { - var captchaAns *modeltiphereth.CaptchaAns + var captchaAns *model.CaptchaAns if req.GetCaptcha() != nil { - captchaAns = &modeltiphereth.CaptchaAns{ + captchaAns = &model.CaptchaAns{ ID: req.GetCaptcha().GetId(), Value: req.GetCaptcha().GetValue(), } @@ -151,12 +150,12 @@ func (s *LibrarianSephirahServiceService) CreateUser(ctx context.Context, req *p if req.GetUser() == nil { return nil, pb.ErrorErrorReasonBadRequest("") } - id, err := s.t.CreateUser(ctx, converter.ToBizUser(req.GetUser())) + user, err := s.t.CreateUser(ctx, converter.ToBizUser(req.GetUser())) if err != nil { return nil, err } return &pb.CreateUserResponse{ - Id: converter.ToPBInternalID(*id), + Id: converter.ToPBInternalID(user.ID), }, nil } func (s *LibrarianSephirahServiceService) UpdateUser(ctx context.Context, req *pb.UpdateUserRequest) ( @@ -205,7 +204,7 @@ func (s *LibrarianSephirahServiceService) LinkAccount(ctx context.Context, req * if req.GetAccountId() == nil { return nil, pb.ErrorErrorReasonBadRequest("") } - a, err := s.t.LinkAccount(ctx, modeltiphereth.Account{ + a, err := s.t.LinkAccount(ctx, model.Account{ ID: 0, Platform: req.GetAccountId().GetPlatform(), PlatformAccountID: req.GetAccountId().GetPlatformAccountId(), @@ -225,7 +224,7 @@ func (s *LibrarianSephirahServiceService) UnLinkAccount(ctx context.Context, req if req.GetAccountId() == nil { return nil, pb.ErrorErrorReasonBadRequest("") } - if err := s.t.UnLinkAccount(ctx, modeltiphereth.Account{ + if err := s.t.UnLinkAccount(ctx, model.Account{ ID: 0, Platform: req.GetAccountId().GetPlatform(), PlatformAccountID: req.GetAccountId().GetPlatformAccountId(), diff --git a/app/sephirah/internal/service/yesod.go b/internal/service/sephirah/yesod.go similarity index 99% rename from app/sephirah/internal/service/yesod.go rename to internal/service/sephirah/yesod.go index 91d19190..3848ec0a 100644 --- a/app/sephirah/internal/service/yesod.go +++ b/internal/service/sephirah/yesod.go @@ -1,10 +1,10 @@ -package service +package sephirah import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/service/sephirah/converter" pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1" librarian "github.com/tuihub/protos/pkg/librarian/v1" ) diff --git a/app/sephirah/internal/supervisor/feature.go b/internal/service/supervisor/feature.go similarity index 95% rename from app/sephirah/internal/supervisor/feature.go rename to internal/service/supervisor/feature.go index 77d366ed..ad9e0bc5 100644 --- a/app/sephirah/internal/supervisor/feature.go +++ b/internal/service/supervisor/feature.go @@ -3,8 +3,8 @@ package supervisor import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/client" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/client/client" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) func (s *Supervisor) HasAccountPlatform(platform string) bool { diff --git a/app/sephirah/internal/supervisor/summary.go b/internal/service/supervisor/summary.go similarity index 96% rename from app/sephirah/internal/supervisor/summary.go rename to internal/service/supervisor/summary.go index 7f3cfffd..aa3f20a8 100644 --- a/app/sephirah/internal/supervisor/summary.go +++ b/internal/service/supervisor/summary.go @@ -3,8 +3,8 @@ package supervisor import ( "context" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" "github.com/tuihub/librarian/internal/lib/libtype" + "github.com/tuihub/librarian/internal/model/modelsupervisor" ) func (s *Supervisor) GetFeatureSummary() *modelsupervisor.ServerFeatureSummary { diff --git a/app/sephirah/internal/supervisor/supervisor.go b/internal/service/supervisor/supervisor.go similarity index 95% rename from app/sephirah/internal/supervisor/supervisor.go rename to internal/service/supervisor/supervisor.go index ef36813e..4b8402b8 100644 --- a/app/sephirah/internal/supervisor/supervisor.go +++ b/internal/service/supervisor/supervisor.go @@ -7,11 +7,7 @@ import ( "sync" "time" - "github.com/tuihub/librarian/app/sephirah/internal/client" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelnetzach" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" - "github.com/tuihub/librarian/app/sephirah/internal/model/modeltiphereth" + "github.com/tuihub/librarian/internal/client/client" "github.com/tuihub/librarian/internal/conf" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/lib/libcache" @@ -20,6 +16,9 @@ import ( "github.com/tuihub/librarian/internal/lib/libtype" "github.com/tuihub/librarian/internal/lib/logger" "github.com/tuihub/librarian/internal/model" + "github.com/tuihub/librarian/internal/model/modelnetzach" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/service/sephirah/converter" porter "github.com/tuihub/protos/pkg/librarian/porter/v1" "github.com/google/uuid" @@ -185,7 +184,7 @@ func (s *Supervisor) RefreshAliveInstances( //nolint:gocognit,funlen // TODO var ins *modelsupervisor.PorterInstance if ins, err = s.instanceCache.Get(ctx, address); err != nil || ins == nil || - ins.Status != modeltiphereth.UserStatusActive { + ins.Status != model.UserStatusActive { return true } @@ -288,7 +287,7 @@ func (s *Supervisor) evaluatePorterInstance( Address: address, Region: info.GetRegion(), FeatureSummary: feature, - Status: modeltiphereth.UserStatusUnspecified, + Status: model.UserStatusUnspecified, ContextJSONSchema: info.GetContextJsonSchema(), }, nil } @@ -314,7 +313,7 @@ func (s *Supervisor) enablePorterInstance( instance.ID, 0, libauth.ClaimsTypeRefreshToken, - libauth.UserTypePorter, + model.UserTypePorter, nil, libtime.Hour, ) diff --git a/app/sephirah/internal/supervisor/task.go b/internal/service/supervisor/task.go similarity index 94% rename from app/sephirah/internal/supervisor/task.go rename to internal/service/supervisor/task.go index 8dd9856a..25f81f17 100644 --- a/app/sephirah/internal/supervisor/task.go +++ b/internal/service/supervisor/task.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/tuihub/librarian/app/sephirah/internal/client" - "github.com/tuihub/librarian/app/sephirah/internal/model/converter" - "github.com/tuihub/librarian/app/sephirah/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/client/client" "github.com/tuihub/librarian/internal/lib/libmq" "github.com/tuihub/librarian/internal/lib/libtype" + "github.com/tuihub/librarian/internal/model/modelsupervisor" + "github.com/tuihub/librarian/internal/service/sephirah/converter" porter "github.com/tuihub/protos/pkg/librarian/porter/v1" ) diff --git a/cmd/librarian/main.go b/main.go similarity index 97% rename from cmd/librarian/main.go rename to main.go index 5cbdac1f..96dcd0c0 100644 --- a/cmd/librarian/main.go +++ b/main.go @@ -12,6 +12,7 @@ import ( "github.com/tuihub/librarian/internal/lib/libobserve" "github.com/tuihub/librarian/internal/lib/libsentry" "github.com/tuihub/librarian/internal/lib/libzap" + "github.com/tuihub/librarian/internal/service/angelaweb" miner "github.com/tuihub/protos/pkg/librarian/miner/v1" "github.com/go-kratos/kratos/v2" @@ -45,6 +46,7 @@ var ProviderSet = wire.NewSet( func newApp( gs *grpc.Server, hs *http.Server, + aw *angelaweb.AngelaWeb, mq *libmq.MQ, cron *libcron.Cron, obs *libobserve.BuiltInObserver, @@ -55,7 +57,7 @@ func newApp( kratos.Name(name), kratos.Version(version), kratos.Metadata(map[string]string{}), - kratos.Server(gs, hs, mq, cron, obs), + kratos.Server(gs, hs, aw, mq, cron, obs), } r, err := libapp.NewRegistrar(consul) if err == nil { diff --git a/tests/Makefile b/tests/Makefile index 44990df1..df11cd43 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -14,6 +14,6 @@ test: cd bin && goc server & #cd bin && ./fakes3 & sleep 1s - cd bin && CREATE_ADMIN=true ./librarian -conf ../../configs/example-for-testing.yaml & + cd bin && CREATE_ADMIN=true ./librarian -conf ../../configs/example-for-testing.toml & cd bin && ./client goc profile -o ../coverage-goc.out diff --git a/cmd/librarian/wire.go b/wire.go similarity index 75% rename from cmd/librarian/wire.go rename to wire.go index 353f9220..ac474275 100644 --- a/cmd/librarian/wire.go +++ b/wire.go @@ -6,8 +6,10 @@ package main import ( minerService "github.com/tuihub/librarian/app/miner/pkg/service" - sephirahService "github.com/tuihub/librarian/app/sephirah/pkg/service" + "github.com/tuihub/librarian/internal/biz" + "github.com/tuihub/librarian/internal/client/client" "github.com/tuihub/librarian/internal/conf" + "github.com/tuihub/librarian/internal/data" "github.com/tuihub/librarian/internal/inprocgrpc" "github.com/tuihub/librarian/internal/lib/libapp" "github.com/tuihub/librarian/internal/lib/libauth" @@ -18,6 +20,9 @@ import ( "github.com/tuihub/librarian/internal/lib/libobserve" "github.com/tuihub/librarian/internal/lib/libsearch" "github.com/tuihub/librarian/internal/server" + "github.com/tuihub/librarian/internal/service/angelaweb" + "github.com/tuihub/librarian/internal/service/sephirah" + "github.com/tuihub/librarian/internal/service/supervisor" "github.com/go-kratos/kratos/v2" "github.com/google/wire" @@ -40,8 +45,13 @@ func wireApp( ) (*kratos.App, func(), error) { panic( wire.Build( - sephirahService.ProviderSet, minerService.ProviderSet, + angelaweb.ProviderSet, + data.ProviderSet, + biz.ProviderSet, + client.ProviderSet, + supervisor.ProviderSet, + sephirah.ProviderSet, server.ProviderSet, inprocgrpc.ProviderSet, libauth.ProviderSet, diff --git a/app/sephirah/cmd/sephirah/wire_gen.go b/wire_gen.go similarity index 63% rename from app/sephirah/cmd/sephirah/wire_gen.go rename to wire_gen.go index c17d6816..44b1e955 100644 --- a/app/sephirah/cmd/sephirah/wire_gen.go +++ b/wire_gen.go @@ -8,19 +8,18 @@ package main import ( "github.com/go-kratos/kratos/v2" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizangela" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizbinah" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizchesed" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizgebura" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biznetzach" - "github.com/tuihub/librarian/app/sephirah/internal/biz/biztiphereth" - "github.com/tuihub/librarian/app/sephirah/internal/biz/bizyesod" - "github.com/tuihub/librarian/app/sephirah/internal/client" - "github.com/tuihub/librarian/app/sephirah/internal/data" - "github.com/tuihub/librarian/app/sephirah/internal/service" - "github.com/tuihub/librarian/app/sephirah/internal/supervisor" - client2 "github.com/tuihub/librarian/internal/client" + "github.com/tuihub/librarian/app/miner/pkg/service" + "github.com/tuihub/librarian/internal/biz/bizbinah" + "github.com/tuihub/librarian/internal/biz/bizchesed" + "github.com/tuihub/librarian/internal/biz/bizgebura" + "github.com/tuihub/librarian/internal/biz/bizkether" + "github.com/tuihub/librarian/internal/biz/biznetzach" + "github.com/tuihub/librarian/internal/biz/biztiphereth" + "github.com/tuihub/librarian/internal/biz/bizyesod" + "github.com/tuihub/librarian/internal/client/client" "github.com/tuihub/librarian/internal/conf" + "github.com/tuihub/librarian/internal/data" + "github.com/tuihub/librarian/internal/inprocgrpc" "github.com/tuihub/librarian/internal/lib/libapp" "github.com/tuihub/librarian/internal/lib/libauth" "github.com/tuihub/librarian/internal/lib/libcache" @@ -30,12 +29,15 @@ import ( "github.com/tuihub/librarian/internal/lib/libobserve" "github.com/tuihub/librarian/internal/lib/libsearch" "github.com/tuihub/librarian/internal/server" + "github.com/tuihub/librarian/internal/service/angelaweb" + "github.com/tuihub/librarian/internal/service/sephirah" + "github.com/tuihub/librarian/internal/service/supervisor" ) // Injectors from wire.go: // wireApp init kratos application. -func wireApp(sephirahServer *conf.SephirahServer, database *conf.Database, s3 *conf.S3, porter *conf.Porter, auth *conf.Auth, mq *conf.MQ, cache *conf.Cache, consul *conf.Consul, search *conf.Search, settings *libapp.Settings) (*kratos.App, func(), error) { +func wireApp(librarian_EnableServiceDiscovery *conf.Librarian_EnableServiceDiscovery, sephirahServer *conf.SephirahServer, database *conf.Database, s3 *conf.S3, porter *conf.Porter, miner_Data *conf.Miner_Data, auth *conf.Auth, mq *conf.MQ, cache *conf.Cache, consul *conf.Consul, search *conf.Search, settings *libapp.Settings) (*kratos.App, func(), error) { libauthAuth, err := libauth.NewAuth(auth) if err != nil { return nil, nil, err @@ -45,7 +47,7 @@ func wireApp(sephirahServer *conf.SephirahServer, database *conf.Database, s3 *c return nil, nil, err } dataData := data.NewData(entClient) - angelaRepo := data.NewAngelaRepo(dataData) + ketherRepo := data.NewKetherRepo(dataData) builtInObserver, err := libobserve.NewBuiltInObserver() if err != nil { cleanup() @@ -93,25 +95,25 @@ func wireApp(sephirahServer *conf.SephirahServer, database *conf.Database, s3 *c cleanup() return nil, nil, err } - angelaBase, err := bizangela.NewAngelaBase(angelaRepo, supervisorSupervisor, geburaRepo, librarianPorterServiceClient, libsearchSearch, idGenerator) + ketherBase, err := bizkether.NewKetherBase(ketherRepo, supervisorSupervisor, geburaRepo, librarianPorterServiceClient, libsearchSearch, idGenerator) if err != nil { cleanup2() cleanup() return nil, nil, err } - map3 := bizangela.NewAppInfoCache(geburaRepo, store) - libmqTopic := bizangela.NewUpdateAppInfoIndexTopic(angelaBase) - topic2 := bizangela.NewPullAppInfoTopic(angelaBase, map3, libmqTopic) - topic3 := bizangela.NewPullAccountAppInfoRelationTopic(angelaBase, topic2) - topic4 := bizangela.NewPullAccountTopic(angelaBase, topic3) - map4 := bizangela.NewNotifyFlowCache(netzachRepo, store) - map5 := bizangela.NewFeedToNotifyFlowCache(netzachRepo, store) - map6 := bizangela.NewNotifyTargetCache(netzachRepo, store) - topic5 := bizangela.NewNotifyPushTopic(angelaBase, map6) - topic6 := bizangela.NewNotifyRouterTopic(angelaBase, map4, map5, topic5) - topic7 := bizangela.NewFeedItemPostprocessTopic(angelaBase, topic6, topic) - topic8 := bizangela.NewPullFeedTopic(angelaBase, topic7, topic) - angela, err := bizangela.NewAngela(angelaBase, libmqMQ, topic4, topic3, topic2, topic8, topic6, topic5, topic7, libmqTopic) + map3 := bizkether.NewAppInfoCache(geburaRepo, store) + libmqTopic := bizkether.NewUpdateAppInfoIndexTopic(ketherBase) + topic2 := bizkether.NewPullAppInfoTopic(ketherBase, map3, libmqTopic) + topic3 := bizkether.NewPullAccountAppInfoRelationTopic(ketherBase, topic2) + topic4 := bizkether.NewPullAccountTopic(ketherBase, topic3) + map4 := bizkether.NewNotifyFlowCache(netzachRepo, store) + map5 := bizkether.NewFeedToNotifyFlowCache(netzachRepo, store) + map6 := bizkether.NewNotifyTargetCache(netzachRepo, store) + topic5 := bizkether.NewNotifyPushTopic(ketherBase, map6) + topic6 := bizkether.NewNotifyRouterTopic(ketherBase, map4, map5, topic5) + topic7 := bizkether.NewFeedItemPostprocessTopic(ketherBase, topic6, topic) + topic8 := bizkether.NewPullFeedTopic(ketherBase, topic7, topic) + kether, err := bizkether.NewKether(ketherBase, libmqMQ, topic4, topic3, topic2, topic8, topic6, topic5, topic7, libmqTopic) if err != nil { cleanup2() cleanup() @@ -154,40 +156,53 @@ func wireApp(sephirahServer *conf.SephirahServer, database *conf.Database, s3 *c return nil, nil, err } chesedRepo := data.NewChesedRepo(dataData) - librarianMinerServiceClient, err := client2.NewMinerClient(consul, settings) + librarianMinerServiceServer, cleanup3, err := service.NewMinerService(miner_Data, settings) if err != nil { cleanup2() cleanup() return nil, nil, err } + inprocClients := inprocgrpc.NewInprocClients(librarianMinerServiceServer) + librarianMinerServiceClient, err := minerClientSelector(librarian_EnableServiceDiscovery, consul, inprocClients, settings) + if err != nil { + cleanup3() + cleanup2() + cleanup() + return nil, nil, err + } map8 := bizchesed.NewImageCache(store) chesed, err := bizchesed.NewChesed(chesedRepo, binahRepo, idGenerator, libsearchSearch, cron, librarianPorterServiceClient, librarianMinerServiceClient, controlBlock, map8) if err != nil { + cleanup3() cleanup2() cleanup() return nil, nil, err } - librarianSephirahServiceServer := service.NewLibrarianSephirahServiceService(angela, tiphereth, gebura, binah, yesod, netzach, chesed, supervisorSupervisor, settings, libauthAuth, sephirahServer) + librarianSephirahServiceServer := sephirah.NewLibrarianSephirahServiceService(kether, tiphereth, gebura, binah, yesod, netzach, chesed, supervisorSupervisor, settings, libauthAuth, sephirahServer) grpcServer, err := server.NewGRPCServer(sephirahServer, libauthAuth, librarianSephirahServiceServer, settings, builtInObserver) if err != nil { + cleanup3() cleanup2() cleanup() return nil, nil, err } httpServer, err := server.NewGrpcWebServer(grpcServer, sephirahServer, libauthAuth, settings, builtInObserver) if err != nil { + cleanup3() cleanup2() cleanup() return nil, nil, err } - registrar, err := libapp.NewRegistrar(consul) + angelaWeb := angelaweb.NewAngelaWeb(libauthAuth, tiphereth, key) + app, err := newApp(grpcServer, httpServer, angelaWeb, libmqMQ, cron, builtInObserver, consul) if err != nil { + cleanup3() cleanup2() cleanup() return nil, nil, err } - app := newApp(grpcServer, httpServer, libmqMQ, cron, registrar) return app, func() { + cleanup3() cleanup2() cleanup() }, nil