From a0c720eb2fdbe48ecf9324c755b907e19cc02dfa Mon Sep 17 00:00:00 2001 From: wwweww <2646787260@qq.com> Date: Fri, 27 Feb 2026 05:42:13 +0800 Subject: [PATCH] add: user accomplished --- Herebyfile.mjs | 3 +- .../logic/email/sendVerificationCodeLogic.go | 3 +- app/user_verifications/rpc/etc/pb.yaml | 28 + .../rpc/internal/config/config.go | 7 + .../logic/addUserVerificationsLogic.go | 31 + .../logic/delUserVerificationsLogic.go | 30 + .../logic/getUserVerificationsByIdLogic.go | 30 + .../logic/searchUserVerificationsLogic.go | 30 + .../logic/updateUserVerificationsLogic.go | 30 + .../server/userVerificationsServer.go | 50 + .../rpc/internal/svc/serviceContext.go | 13 + .../internal/svc/userVerificationsModel.go | 27 + .../svc/userVerificationsModel_gen.go | 154 +++ .../rpc/internal/svc}/vars.go | 2 +- app/user_verifications/rpc/pb.go | 39 + .../rpc/pb/user_verifications.pb.go | 936 ++++++++++++++ .../rpc/pb/user_verifications_grpc.pb.go | 275 +++++ .../userverifications/userVerifications.go | 73 ++ app/users/api/internal/contextx/contextx.go | 24 + app/users/api/internal/handler/routes.go | 53 +- .../api/internal/handler/user/getMeHandler.go | 30 + .../api/internal/handler/user/loginHandler.go | 3 +- .../internal/handler/user/updateMeHandler.go | 32 + .../user/updatePasswordByVcodeHandler.go | 32 + .../api/internal/logic/user/getMeLogic.go | 50 + .../internal/logic/user/getUserInfoLogic.go | 2 +- .../api/internal/logic/user/loginLogic.go | 2 +- .../api/internal/logic/user/updateMeLogic.go | 55 + .../logic/user/updatePasswordByVcodeLogic.go | 58 + .../logic/user/updatePasswordLogic.go | 38 + .../logic/user/updateUserInfoLogic.go | 18 +- app/users/api/internal/types/types.go | 16 +- .../internal/logic/getUserByUsernameLogic.go | 11 +- .../rpc/internal/logic/getUsersByIdLogic.go | 9 +- app/users/rpc/internal/logic/loginLogic.go | 14 +- app/users/rpc/internal/logic/registerLogic.go | 36 +- .../rpc/internal/logic/resetPasswordLogic.go | 49 + .../rpc/internal/logic/searchUsersLogic.go | 62 +- .../rpc/internal/logic/updateUsersLogic.go | 16 +- .../rpc/internal/logic/validateTokenLogic.go | 6 +- app/users/rpc/internal/models/client.go | 341 ++++++ app/users/rpc/internal/models/ent.go | 608 ++++++++++ .../rpc/internal/models/enttest/enttest.go | 85 ++ app/users/rpc/internal/models/generate.go | 3 + app/users/rpc/internal/models/hook/hook.go | 198 +++ .../rpc/internal/models/migrate/migrate.go | 64 + .../rpc/internal/models/migrate/schema.go | 42 + app/users/rpc/internal/models/mutation.go | 1079 +++++++++++++++++ .../internal/models/predicate/predicate.go | 10 + app/users/rpc/internal/models/runtime.go | 29 + .../rpc/internal/models/runtime/runtime.go | 10 + app/users/rpc/internal/models/schema/users.go | 45 + app/users/rpc/internal/models/tx.go | 210 ++++ app/users/rpc/internal/models/users.go | 259 ++++ app/users/rpc/internal/models/users/users.go | 152 +++ app/users/rpc/internal/models/users/where.go | 780 ++++++++++++ app/users/rpc/internal/models/usersModel.go | 27 - .../rpc/internal/models/usersModel_gen.go | 206 ---- app/users/rpc/internal/models/users_create.go | 408 +++++++ app/users/rpc/internal/models/users_delete.go | 88 ++ app/users/rpc/internal/models/users_query.go | 527 ++++++++ app/users/rpc/internal/models/users_update.go | 660 ++++++++++ .../rpc/internal/server/usercenterServer.go | 5 + app/users/rpc/internal/svc/serviceContext.go | 39 +- app/users/rpc/pb/users.pb.go | 788 ++++++++---- app/users/rpc/pb/users_grpc.pb.go | 40 +- app/users/rpc/usercenter/usercenter.go | 8 + {deploy/k8s/envoy => backup}/envoy copy.yaml | 0 common/redisx/keys.go | 9 + deploy/k8s/envoy/envoy.yaml | 618 +++++----- deploy/k8s/secrets/jwt-secret.yaml | 2 +- deploy/k8s/secrets/rc-creds.yaml | 9 + deploy/k8s/service/authz/authz-adapter.yaml | 4 +- deploy/k8s/service/email/email-api.yaml | 3 +- deploy/k8s/service/email/email-mq.yaml | 3 +- deploy/k8s/service/snowflake/snowflake.yaml | 3 +- deploy/k8s/service/user/user-api.yaml | 147 ++- deploy/k8s/service/user/user-rpc.yaml | 98 +- desc/api/email.api | 17 + desc/api/users.api | 260 ++-- desc/rpc/user_verifications.proto | 105 ++ desc/rpc/users.proto | 123 +- desc/sql/users.sql | 20 - desc/sql/users/user_verifications.sql | 35 + desc/sql/users/users.sql | 29 + go.mod | 16 + go.sum | 106 +- package-lock.json | 14 + package.json | 1 + pkg/adapter/redis_cache.go | 62 + 90 files changed, 9592 insertions(+), 1180 deletions(-) create mode 100644 app/user_verifications/rpc/etc/pb.yaml create mode 100644 app/user_verifications/rpc/internal/config/config.go create mode 100644 app/user_verifications/rpc/internal/logic/addUserVerificationsLogic.go create mode 100644 app/user_verifications/rpc/internal/logic/delUserVerificationsLogic.go create mode 100644 app/user_verifications/rpc/internal/logic/getUserVerificationsByIdLogic.go create mode 100644 app/user_verifications/rpc/internal/logic/searchUserVerificationsLogic.go create mode 100644 app/user_verifications/rpc/internal/logic/updateUserVerificationsLogic.go create mode 100644 app/user_verifications/rpc/internal/server/userVerificationsServer.go create mode 100644 app/user_verifications/rpc/internal/svc/serviceContext.go create mode 100644 app/user_verifications/rpc/internal/svc/userVerificationsModel.go create mode 100644 app/user_verifications/rpc/internal/svc/userVerificationsModel_gen.go rename app/{users/rpc/internal/models => user_verifications/rpc/internal/svc}/vars.go (85%) create mode 100644 app/user_verifications/rpc/pb.go create mode 100644 app/user_verifications/rpc/pb/user_verifications.pb.go create mode 100644 app/user_verifications/rpc/pb/user_verifications_grpc.pb.go create mode 100644 app/user_verifications/rpc/userverifications/userVerifications.go create mode 100644 app/users/api/internal/handler/user/getMeHandler.go create mode 100644 app/users/api/internal/handler/user/updateMeHandler.go create mode 100644 app/users/api/internal/handler/user/updatePasswordByVcodeHandler.go create mode 100644 app/users/api/internal/logic/user/getMeLogic.go create mode 100644 app/users/api/internal/logic/user/updateMeLogic.go create mode 100644 app/users/api/internal/logic/user/updatePasswordByVcodeLogic.go create mode 100644 app/users/rpc/internal/logic/resetPasswordLogic.go create mode 100644 app/users/rpc/internal/models/client.go create mode 100644 app/users/rpc/internal/models/ent.go create mode 100644 app/users/rpc/internal/models/enttest/enttest.go create mode 100644 app/users/rpc/internal/models/generate.go create mode 100644 app/users/rpc/internal/models/hook/hook.go create mode 100644 app/users/rpc/internal/models/migrate/migrate.go create mode 100644 app/users/rpc/internal/models/migrate/schema.go create mode 100644 app/users/rpc/internal/models/mutation.go create mode 100644 app/users/rpc/internal/models/predicate/predicate.go create mode 100644 app/users/rpc/internal/models/runtime.go create mode 100644 app/users/rpc/internal/models/runtime/runtime.go create mode 100644 app/users/rpc/internal/models/schema/users.go create mode 100644 app/users/rpc/internal/models/tx.go create mode 100644 app/users/rpc/internal/models/users.go create mode 100644 app/users/rpc/internal/models/users/users.go create mode 100644 app/users/rpc/internal/models/users/where.go delete mode 100644 app/users/rpc/internal/models/usersModel.go delete mode 100644 app/users/rpc/internal/models/usersModel_gen.go create mode 100644 app/users/rpc/internal/models/users_create.go create mode 100644 app/users/rpc/internal/models/users_delete.go create mode 100644 app/users/rpc/internal/models/users_query.go create mode 100644 app/users/rpc/internal/models/users_update.go rename {deploy/k8s/envoy => backup}/envoy copy.yaml (100%) create mode 100644 common/redisx/keys.go create mode 100644 deploy/k8s/secrets/rc-creds.yaml create mode 100644 desc/rpc/user_verifications.proto delete mode 100644 desc/sql/users.sql create mode 100644 desc/sql/users/user_verifications.sql create mode 100644 desc/sql/users/users.sql create mode 100644 pkg/adapter/redis_cache.go diff --git a/Herebyfile.mjs b/Herebyfile.mjs index e1ca88f..4949c08 100644 --- a/Herebyfile.mjs +++ b/Herebyfile.mjs @@ -19,7 +19,6 @@ const { values } = parseArgs({ } }) - const Paths = { root: __dirname, desc: path.join(__dirname, "desc"), @@ -92,7 +91,7 @@ const Generators = { await run('goctl', [ "docker", "--go", path.relative(__dirname, servicePath) ]) - } + }, }; diff --git a/app/email/api/internal/logic/email/sendVerificationCodeLogic.go b/app/email/api/internal/logic/email/sendVerificationCodeLogic.go index f5464dd..010c2bf 100644 --- a/app/email/api/internal/logic/email/sendVerificationCodeLogic.go +++ b/app/email/api/internal/logic/email/sendVerificationCodeLogic.go @@ -7,6 +7,7 @@ import ( "context" "encoding/json" "fmt" + "juwan-backend/common/redisx" "time" "juwan-backend/app/email/api/internal/svc" @@ -44,7 +45,7 @@ func (l *SendVerificationCodeLogic) SendVerificationCode(req *types.SendVerifica code := utils.GenCode() requestID := uuid.NewString() - redisKey := fmt.Sprintf("vcode:%s:%s:%s", requestID, req.Scene, req.Email) + redisKey := fmt.Sprintf(redisx.VCODE_KEY_PREFIX, requestID, req.Scene, req.Email) if exists, getErr := l.svcCtx.RedisCluster.Get(l.ctx, redisKey).Result(); getErr == nil && exists != "" { return nil, fmt.Errorf("verification code already sent, please wait before requesting a new one") } diff --git a/app/user_verifications/rpc/etc/pb.yaml b/app/user_verifications/rpc/etc/pb.yaml new file mode 100644 index 0000000..8faa7f7 --- /dev/null +++ b/app/user_verifications/rpc/etc/pb.yaml @@ -0,0 +1,28 @@ +Name: pb.rpc +ListenOn: 0.0.0.0:8080 + +DataSource: "${DB_URI}?sslmode=disable" + +SnowflakeRpcConf: + Target: k8s://juwan/snowflake-svc:8080 + +DB: + Master: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@user-db-rw.juwan:${DB_PORT}/${DB_NAME}?sslmode=disable" + Slave: "postgresql://${PD_USERNAME}:${DB_PASSWORD}@user-db-ro.juwan:${DB_PORT}/${DB_NAME}?sslmode=disable" + +CacheConf: + - Host: "${REDIS_M_HOST}" + Type: node + Pass: "${REDIS_PASSWORD}" + User: "default" + - Host: "${REDIS_S_HOST}" + Type: node + Pass: "${REDIS_PASSWORD}" + User: "default" + +Jwt: + SecretKey: "${JWT_SECRET_KEY}" + Issuer: "juwan-user-rpc" + +Log: + Level: info diff --git a/app/user_verifications/rpc/internal/config/config.go b/app/user_verifications/rpc/internal/config/config.go new file mode 100644 index 0000000..c1f85b9 --- /dev/null +++ b/app/user_verifications/rpc/internal/config/config.go @@ -0,0 +1,7 @@ +package config + +import "github.com/zeromicro/go-zero/zrpc" + +type Config struct { + zrpc.RpcServerConf +} diff --git a/app/user_verifications/rpc/internal/logic/addUserVerificationsLogic.go b/app/user_verifications/rpc/internal/logic/addUserVerificationsLogic.go new file mode 100644 index 0000000..a0c859a --- /dev/null +++ b/app/user_verifications/rpc/internal/logic/addUserVerificationsLogic.go @@ -0,0 +1,31 @@ +package logic + +import ( + "context" + + "juwan-backend/app/user_verifications/rpc/internal/svc" + "juwan-backend/app/user_verifications/rpc/pb" + + "github.com/zeromicro/go-zero/core/logx" +) + +type AddUserVerificationsLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewAddUserVerificationsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AddUserVerificationsLogic { + return &AddUserVerificationsLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +// -----------------------userVerifications----------------------- +func (l *AddUserVerificationsLogic) AddUserVerifications(in *pb.AddUserVerificationsReq) (*pb.AddUserVerificationsResp, error) { + // todo: add your logic here and delete this line + + return &pb.AddUserVerificationsResp{}, nil +} diff --git a/app/user_verifications/rpc/internal/logic/delUserVerificationsLogic.go b/app/user_verifications/rpc/internal/logic/delUserVerificationsLogic.go new file mode 100644 index 0000000..4209d18 --- /dev/null +++ b/app/user_verifications/rpc/internal/logic/delUserVerificationsLogic.go @@ -0,0 +1,30 @@ +package logic + +import ( + "context" + + "juwan-backend/app/user_verifications/rpc/internal/svc" + "juwan-backend/app/user_verifications/rpc/pb" + + "github.com/zeromicro/go-zero/core/logx" +) + +type DelUserVerificationsLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewDelUserVerificationsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DelUserVerificationsLogic { + return &DelUserVerificationsLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *DelUserVerificationsLogic) DelUserVerifications(in *pb.DelUserVerificationsReq) (*pb.DelUserVerificationsResp, error) { + // todo: add your logic here and delete this line + + return &pb.DelUserVerificationsResp{}, nil +} diff --git a/app/user_verifications/rpc/internal/logic/getUserVerificationsByIdLogic.go b/app/user_verifications/rpc/internal/logic/getUserVerificationsByIdLogic.go new file mode 100644 index 0000000..4698785 --- /dev/null +++ b/app/user_verifications/rpc/internal/logic/getUserVerificationsByIdLogic.go @@ -0,0 +1,30 @@ +package logic + +import ( + "context" + + "juwan-backend/app/user_verifications/rpc/internal/svc" + "juwan-backend/app/user_verifications/rpc/pb" + + "github.com/zeromicro/go-zero/core/logx" +) + +type GetUserVerificationsByIdLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewGetUserVerificationsByIdLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserVerificationsByIdLogic { + return &GetUserVerificationsByIdLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *GetUserVerificationsByIdLogic) GetUserVerificationsById(in *pb.GetUserVerificationsByIdReq) (*pb.GetUserVerificationsByIdResp, error) { + // todo: add your logic here and delete this line + + return &pb.GetUserVerificationsByIdResp{}, nil +} diff --git a/app/user_verifications/rpc/internal/logic/searchUserVerificationsLogic.go b/app/user_verifications/rpc/internal/logic/searchUserVerificationsLogic.go new file mode 100644 index 0000000..3ee5d05 --- /dev/null +++ b/app/user_verifications/rpc/internal/logic/searchUserVerificationsLogic.go @@ -0,0 +1,30 @@ +package logic + +import ( + "context" + + "juwan-backend/app/user_verifications/rpc/internal/svc" + "juwan-backend/app/user_verifications/rpc/pb" + + "github.com/zeromicro/go-zero/core/logx" +) + +type SearchUserVerificationsLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewSearchUserVerificationsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SearchUserVerificationsLogic { + return &SearchUserVerificationsLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *SearchUserVerificationsLogic) SearchUserVerifications(in *pb.SearchUserVerificationsReq) (*pb.SearchUserVerificationsResp, error) { + // todo: add your logic here and delete this line + + return &pb.SearchUserVerificationsResp{}, nil +} diff --git a/app/user_verifications/rpc/internal/logic/updateUserVerificationsLogic.go b/app/user_verifications/rpc/internal/logic/updateUserVerificationsLogic.go new file mode 100644 index 0000000..15e7fb1 --- /dev/null +++ b/app/user_verifications/rpc/internal/logic/updateUserVerificationsLogic.go @@ -0,0 +1,30 @@ +package logic + +import ( + "context" + + "juwan-backend/app/user_verifications/rpc/internal/svc" + "juwan-backend/app/user_verifications/rpc/pb" + + "github.com/zeromicro/go-zero/core/logx" +) + +type UpdateUserVerificationsLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewUpdateUserVerificationsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateUserVerificationsLogic { + return &UpdateUserVerificationsLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *UpdateUserVerificationsLogic) UpdateUserVerifications(in *pb.UpdateUserVerificationsReq) (*pb.UpdateUserVerificationsResp, error) { + // todo: add your logic here and delete this line + + return &pb.UpdateUserVerificationsResp{}, nil +} diff --git a/app/user_verifications/rpc/internal/server/userVerificationsServer.go b/app/user_verifications/rpc/internal/server/userVerificationsServer.go new file mode 100644 index 0000000..6945d34 --- /dev/null +++ b/app/user_verifications/rpc/internal/server/userVerificationsServer.go @@ -0,0 +1,50 @@ +// Code generated by goctl. DO NOT EDIT. +// goctl 1.9.2 +// Source: user_verifications.proto + +package server + +import ( + "context" + + "juwan-backend/app/user_verifications/rpc/internal/logic" + "juwan-backend/app/user_verifications/rpc/internal/svc" + "juwan-backend/app/user_verifications/rpc/pb" +) + +type UserVerificationsServer struct { + svcCtx *svc.ServiceContext + pb.UnimplementedUserVerificationsServer +} + +func NewUserVerificationsServer(svcCtx *svc.ServiceContext) *UserVerificationsServer { + return &UserVerificationsServer{ + svcCtx: svcCtx, + } +} + +// -----------------------userVerifications----------------------- +func (s *UserVerificationsServer) AddUserVerifications(ctx context.Context, in *pb.AddUserVerificationsReq) (*pb.AddUserVerificationsResp, error) { + l := logic.NewAddUserVerificationsLogic(ctx, s.svcCtx) + return l.AddUserVerifications(in) +} + +func (s *UserVerificationsServer) UpdateUserVerifications(ctx context.Context, in *pb.UpdateUserVerificationsReq) (*pb.UpdateUserVerificationsResp, error) { + l := logic.NewUpdateUserVerificationsLogic(ctx, s.svcCtx) + return l.UpdateUserVerifications(in) +} + +func (s *UserVerificationsServer) DelUserVerifications(ctx context.Context, in *pb.DelUserVerificationsReq) (*pb.DelUserVerificationsResp, error) { + l := logic.NewDelUserVerificationsLogic(ctx, s.svcCtx) + return l.DelUserVerifications(in) +} + +func (s *UserVerificationsServer) GetUserVerificationsById(ctx context.Context, in *pb.GetUserVerificationsByIdReq) (*pb.GetUserVerificationsByIdResp, error) { + l := logic.NewGetUserVerificationsByIdLogic(ctx, s.svcCtx) + return l.GetUserVerificationsById(in) +} + +func (s *UserVerificationsServer) SearchUserVerifications(ctx context.Context, in *pb.SearchUserVerificationsReq) (*pb.SearchUserVerificationsResp, error) { + l := logic.NewSearchUserVerificationsLogic(ctx, s.svcCtx) + return l.SearchUserVerifications(in) +} diff --git a/app/user_verifications/rpc/internal/svc/serviceContext.go b/app/user_verifications/rpc/internal/svc/serviceContext.go new file mode 100644 index 0000000..c49f41b --- /dev/null +++ b/app/user_verifications/rpc/internal/svc/serviceContext.go @@ -0,0 +1,13 @@ +package svc + +import "juwan-backend/app/user_verifications/rpc/internal/config" + +type ServiceContext struct { + Config config.Config +} + +func NewServiceContext(c config.Config) *ServiceContext { + return &ServiceContext{ + Config: c, + } +} diff --git a/app/user_verifications/rpc/internal/svc/userVerificationsModel.go b/app/user_verifications/rpc/internal/svc/userVerificationsModel.go new file mode 100644 index 0000000..59c0c67 --- /dev/null +++ b/app/user_verifications/rpc/internal/svc/userVerificationsModel.go @@ -0,0 +1,27 @@ +package svc + +import ( + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/sqlx" +) + +var _ UserVerificationsModel = (*customUserVerificationsModel)(nil) + +type ( + // UserVerificationsModel is an interface to be customized, add more methods here, + // and implement the added methods in customUserVerificationsModel. + UserVerificationsModel interface { + userVerificationsModel + } + + customUserVerificationsModel struct { + *defaultUserVerificationsModel + } +) + +// NewUserVerificationsModel returns a model for the database table. +func NewUserVerificationsModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) UserVerificationsModel { + return &customUserVerificationsModel{ + defaultUserVerificationsModel: newUserVerificationsModel(conn, c, opts...), + } +} diff --git a/app/user_verifications/rpc/internal/svc/userVerificationsModel_gen.go b/app/user_verifications/rpc/internal/svc/userVerificationsModel_gen.go new file mode 100644 index 0000000..9385283 --- /dev/null +++ b/app/user_verifications/rpc/internal/svc/userVerificationsModel_gen.go @@ -0,0 +1,154 @@ +// Code generated by goctl. DO NOT EDIT. +// versions: +// goctl version: 1.9.2 + +package svc + +import ( + "context" + "database/sql" + "fmt" + "strings" + "time" + + "github.com/zeromicro/go-zero/core/stores/builder" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/sqlc" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stringx" +) + +var ( + userVerificationsFieldNames = builder.RawFieldNames(&UserVerifications{}, true) + userVerificationsRows = strings.Join(userVerificationsFieldNames, ",") + userVerificationsRowsExpectAutoSet = strings.Join(stringx.Remove(userVerificationsFieldNames, "create_at", "create_time", "created_at", "update_at", "update_time", "updated_at"), ",") + userVerificationsRowsWithPlaceHolder = builder.PostgreSqlJoin(stringx.Remove(userVerificationsFieldNames, "id", "create_at", "create_time", "created_at", "update_at", "update_time", "updated_at")) + + cachePublicUserVerificationsIdPrefix = "cache:public:userVerifications:id:" + cachePublicUserVerificationsUserIdRolePrefix = "cache:public:userVerifications:userId:role:" +) + +type ( + userVerificationsModel interface { + Insert(ctx context.Context, data *UserVerifications) (sql.Result, error) + FindOne(ctx context.Context, id int64) (*UserVerifications, error) + FindOneByUserIdRole(ctx context.Context, userId int64, role string) (*UserVerifications, error) + Update(ctx context.Context, data *UserVerifications) error + Delete(ctx context.Context, id int64) error + } + + defaultUserVerificationsModel struct { + sqlc.CachedConn + table string + } + + UserVerifications struct { + Id int64 `db:"id"` + UserId int64 `db:"user_id"` + Role string `db:"role"` + Status string `db:"status"` + Materials string `db:"materials"` + RejectReason sql.NullString `db:"reject_reason"` + ReviewedBy sql.NullInt64 `db:"reviewed_by"` + ReviewedAt sql.NullTime `db:"reviewed_at"` + CreatedAt time.Time `db:"created_at"` + UpdatedAt time.Time `db:"updated_at"` + } +) + +func newUserVerificationsModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultUserVerificationsModel { + return &defaultUserVerificationsModel{ + CachedConn: sqlc.NewConn(conn, c, opts...), + table: `"public"."user_verifications"`, + } +} + +func (m *defaultUserVerificationsModel) Delete(ctx context.Context, id int64) error { + data, err := m.FindOne(ctx, id) + if err != nil { + return err + } + + publicUserVerificationsIdKey := fmt.Sprintf("%s%v", cachePublicUserVerificationsIdPrefix, id) + publicUserVerificationsUserIdRoleKey := fmt.Sprintf("%s%v:%v", cachePublicUserVerificationsUserIdRolePrefix, data.UserId, data.Role) + _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("delete from %s where id = $1", m.table) + return conn.ExecCtx(ctx, query, id) + }, publicUserVerificationsIdKey, publicUserVerificationsUserIdRoleKey) + return err +} + +func (m *defaultUserVerificationsModel) FindOne(ctx context.Context, id int64) (*UserVerifications, error) { + publicUserVerificationsIdKey := fmt.Sprintf("%s%v", cachePublicUserVerificationsIdPrefix, id) + var resp UserVerifications + err := m.QueryRowCtx(ctx, &resp, publicUserVerificationsIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error { + query := fmt.Sprintf("select %s from %s where id = $1 limit 1", userVerificationsRows, m.table) + return conn.QueryRowCtx(ctx, v, query, id) + }) + switch err { + case nil: + return &resp, nil + case sqlc.ErrNotFound: + return nil, ErrNotFound + default: + return nil, err + } +} + +func (m *defaultUserVerificationsModel) FindOneByUserIdRole(ctx context.Context, userId int64, role string) (*UserVerifications, error) { + publicUserVerificationsUserIdRoleKey := fmt.Sprintf("%s%v:%v", cachePublicUserVerificationsUserIdRolePrefix, userId, role) + var resp UserVerifications + err := m.QueryRowIndexCtx(ctx, &resp, publicUserVerificationsUserIdRoleKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) { + query := fmt.Sprintf("select %s from %s where user_id = $1 and role = $2 limit 1", userVerificationsRows, m.table) + if err := conn.QueryRowCtx(ctx, &resp, query, userId, role); err != nil { + return nil, err + } + return resp.Id, nil + }, m.queryPrimary) + switch err { + case nil: + return &resp, nil + case sqlc.ErrNotFound: + return nil, ErrNotFound + default: + return nil, err + } +} + +func (m *defaultUserVerificationsModel) Insert(ctx context.Context, data *UserVerifications) (sql.Result, error) { + publicUserVerificationsIdKey := fmt.Sprintf("%s%v", cachePublicUserVerificationsIdPrefix, data.Id) + publicUserVerificationsUserIdRoleKey := fmt.Sprintf("%s%v:%v", cachePublicUserVerificationsUserIdRolePrefix, data.UserId, data.Role) + ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("insert into %s (%s) values ($1, $2, $3, $4, $5, $6, $7, $8)", m.table, userVerificationsRowsExpectAutoSet) + return conn.ExecCtx(ctx, query, data.Id, data.UserId, data.Role, data.Status, data.Materials, data.RejectReason, data.ReviewedBy, data.ReviewedAt) + }, publicUserVerificationsIdKey, publicUserVerificationsUserIdRoleKey) + return ret, err +} + +func (m *defaultUserVerificationsModel) Update(ctx context.Context, newData *UserVerifications) error { + data, err := m.FindOne(ctx, newData.Id) + if err != nil { + return err + } + + publicUserVerificationsIdKey := fmt.Sprintf("%s%v", cachePublicUserVerificationsIdPrefix, data.Id) + publicUserVerificationsUserIdRoleKey := fmt.Sprintf("%s%v:%v", cachePublicUserVerificationsUserIdRolePrefix, data.UserId, data.Role) + _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + query := fmt.Sprintf("update %s set %s where id = $1", m.table, userVerificationsRowsWithPlaceHolder) + return conn.ExecCtx(ctx, query, newData.Id, newData.UserId, newData.Role, newData.Status, newData.Materials, newData.RejectReason, newData.ReviewedBy, newData.ReviewedAt) + }, publicUserVerificationsIdKey, publicUserVerificationsUserIdRoleKey) + return err +} + +func (m *defaultUserVerificationsModel) formatPrimary(primary any) string { + return fmt.Sprintf("%s%v", cachePublicUserVerificationsIdPrefix, primary) +} + +func (m *defaultUserVerificationsModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error { + query := fmt.Sprintf("select %s from %s where id = $1 limit 1", userVerificationsRows, m.table) + return conn.QueryRowCtx(ctx, v, query, primary) +} + +func (m *defaultUserVerificationsModel) tableName() string { + return m.table +} diff --git a/app/users/rpc/internal/models/vars.go b/app/user_verifications/rpc/internal/svc/vars.go similarity index 85% rename from app/users/rpc/internal/models/vars.go rename to app/user_verifications/rpc/internal/svc/vars.go index 8d22180..e3c6697 100644 --- a/app/users/rpc/internal/models/vars.go +++ b/app/user_verifications/rpc/internal/svc/vars.go @@ -1,4 +1,4 @@ -package models +package svc import "github.com/zeromicro/go-zero/core/stores/sqlx" diff --git a/app/user_verifications/rpc/pb.go b/app/user_verifications/rpc/pb.go new file mode 100644 index 0000000..bef17af --- /dev/null +++ b/app/user_verifications/rpc/pb.go @@ -0,0 +1,39 @@ +package main + +import ( + "flag" + "fmt" + + "juwan-backend/app/user_verifications/rpc/internal/config" + "juwan-backend/app/user_verifications/rpc/internal/server" + "juwan-backend/app/user_verifications/rpc/internal/svc" + "juwan-backend/app/user_verifications/rpc/pb" + + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/core/service" + "github.com/zeromicro/go-zero/zrpc" + "google.golang.org/grpc" + "google.golang.org/grpc/reflection" +) + +var configFile = flag.String("f", "etc/pb.yaml", "the config file") + +func main() { + flag.Parse() + + var c config.Config + conf.MustLoad(*configFile, &c) + ctx := svc.NewServiceContext(c) + + s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) { + pb.RegisterUserVerificationsServer(grpcServer, server.NewUserVerificationsServer(ctx)) + + if c.Mode == service.DevMode || c.Mode == service.TestMode { + reflection.Register(grpcServer) + } + }) + defer s.Stop() + + fmt.Printf("Starting rpc server at %s...\n", c.ListenOn) + s.Start() +} diff --git a/app/user_verifications/rpc/pb/user_verifications.pb.go b/app/user_verifications/rpc/pb/user_verifications.pb.go new file mode 100644 index 0000000..6ad5107 --- /dev/null +++ b/app/user_verifications/rpc/pb/user_verifications.pb.go @@ -0,0 +1,936 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.36.11 +// protoc v5.29.6 +// source: user_verifications.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" + unsafe "unsafe" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +// --------------------------------userVerifications-------------------------------- +type UserVerifications struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` //id + UserId int64 `protobuf:"varint,2,opt,name=userId,proto3" json:"userId,omitempty"` //userId + Role string `protobuf:"bytes,3,opt,name=role,proto3" json:"role,omitempty"` //role + Status string `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"` //status + Materials string `protobuf:"bytes,5,opt,name=materials,proto3" json:"materials,omitempty"` //materials + RejectReason string `protobuf:"bytes,6,opt,name=rejectReason,proto3" json:"rejectReason,omitempty"` //rejectReason + ReviewedBy int64 `protobuf:"varint,7,opt,name=reviewedBy,proto3" json:"reviewedBy,omitempty"` //reviewedBy + ReviewedAt int64 `protobuf:"varint,8,opt,name=reviewedAt,proto3" json:"reviewedAt,omitempty"` //reviewedAt + CreatedAt int64 `protobuf:"varint,9,opt,name=createdAt,proto3" json:"createdAt,omitempty"` //createdAt + UpdatedAt int64 `protobuf:"varint,10,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` //updatedAt + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UserVerifications) Reset() { + *x = UserVerifications{} + mi := &file_user_verifications_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UserVerifications) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserVerifications) ProtoMessage() {} + +func (x *UserVerifications) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[0] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UserVerifications.ProtoReflect.Descriptor instead. +func (*UserVerifications) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{0} +} + +func (x *UserVerifications) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *UserVerifications) GetUserId() int64 { + if x != nil { + return x.UserId + } + return 0 +} + +func (x *UserVerifications) GetRole() string { + if x != nil { + return x.Role + } + return "" +} + +func (x *UserVerifications) GetStatus() string { + if x != nil { + return x.Status + } + return "" +} + +func (x *UserVerifications) GetMaterials() string { + if x != nil { + return x.Materials + } + return "" +} + +func (x *UserVerifications) GetRejectReason() string { + if x != nil { + return x.RejectReason + } + return "" +} + +func (x *UserVerifications) GetReviewedBy() int64 { + if x != nil { + return x.ReviewedBy + } + return 0 +} + +func (x *UserVerifications) GetReviewedAt() int64 { + if x != nil { + return x.ReviewedAt + } + return 0 +} + +func (x *UserVerifications) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *UserVerifications) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +type AddUserVerificationsReq struct { + state protoimpl.MessageState `protogen:"open.v1"` + UserId int64 `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"` //userId + Role string `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"` //role + Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"` //status + Materials string `protobuf:"bytes,4,opt,name=materials,proto3" json:"materials,omitempty"` //materials + RejectReason string `protobuf:"bytes,5,opt,name=rejectReason,proto3" json:"rejectReason,omitempty"` //rejectReason + ReviewedBy int64 `protobuf:"varint,6,opt,name=reviewedBy,proto3" json:"reviewedBy,omitempty"` //reviewedBy + ReviewedAt int64 `protobuf:"varint,7,opt,name=reviewedAt,proto3" json:"reviewedAt,omitempty"` //reviewedAt + CreatedAt int64 `protobuf:"varint,8,opt,name=createdAt,proto3" json:"createdAt,omitempty"` //createdAt + UpdatedAt int64 `protobuf:"varint,9,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` //updatedAt + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *AddUserVerificationsReq) Reset() { + *x = AddUserVerificationsReq{} + mi := &file_user_verifications_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *AddUserVerificationsReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AddUserVerificationsReq) ProtoMessage() {} + +func (x *AddUserVerificationsReq) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use AddUserVerificationsReq.ProtoReflect.Descriptor instead. +func (*AddUserVerificationsReq) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{1} +} + +func (x *AddUserVerificationsReq) GetUserId() int64 { + if x != nil { + return x.UserId + } + return 0 +} + +func (x *AddUserVerificationsReq) GetRole() string { + if x != nil { + return x.Role + } + return "" +} + +func (x *AddUserVerificationsReq) GetStatus() string { + if x != nil { + return x.Status + } + return "" +} + +func (x *AddUserVerificationsReq) GetMaterials() string { + if x != nil { + return x.Materials + } + return "" +} + +func (x *AddUserVerificationsReq) GetRejectReason() string { + if x != nil { + return x.RejectReason + } + return "" +} + +func (x *AddUserVerificationsReq) GetReviewedBy() int64 { + if x != nil { + return x.ReviewedBy + } + return 0 +} + +func (x *AddUserVerificationsReq) GetReviewedAt() int64 { + if x != nil { + return x.ReviewedAt + } + return 0 +} + +func (x *AddUserVerificationsReq) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *AddUserVerificationsReq) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +type AddUserVerificationsResp struct { + state protoimpl.MessageState `protogen:"open.v1"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *AddUserVerificationsResp) Reset() { + *x = AddUserVerificationsResp{} + mi := &file_user_verifications_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *AddUserVerificationsResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*AddUserVerificationsResp) ProtoMessage() {} + +func (x *AddUserVerificationsResp) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use AddUserVerificationsResp.ProtoReflect.Descriptor instead. +func (*AddUserVerificationsResp) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{2} +} + +type UpdateUserVerificationsReq struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` //id + UserId int64 `protobuf:"varint,2,opt,name=userId,proto3" json:"userId,omitempty"` //userId + Role string `protobuf:"bytes,3,opt,name=role,proto3" json:"role,omitempty"` //role + Status string `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"` //status + Materials string `protobuf:"bytes,5,opt,name=materials,proto3" json:"materials,omitempty"` //materials + RejectReason string `protobuf:"bytes,6,opt,name=rejectReason,proto3" json:"rejectReason,omitempty"` //rejectReason + ReviewedBy int64 `protobuf:"varint,7,opt,name=reviewedBy,proto3" json:"reviewedBy,omitempty"` //reviewedBy + ReviewedAt int64 `protobuf:"varint,8,opt,name=reviewedAt,proto3" json:"reviewedAt,omitempty"` //reviewedAt + CreatedAt int64 `protobuf:"varint,9,opt,name=createdAt,proto3" json:"createdAt,omitempty"` //createdAt + UpdatedAt int64 `protobuf:"varint,10,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` //updatedAt + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UpdateUserVerificationsReq) Reset() { + *x = UpdateUserVerificationsReq{} + mi := &file_user_verifications_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateUserVerificationsReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateUserVerificationsReq) ProtoMessage() {} + +func (x *UpdateUserVerificationsReq) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateUserVerificationsReq.ProtoReflect.Descriptor instead. +func (*UpdateUserVerificationsReq) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{3} +} + +func (x *UpdateUserVerificationsReq) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *UpdateUserVerificationsReq) GetUserId() int64 { + if x != nil { + return x.UserId + } + return 0 +} + +func (x *UpdateUserVerificationsReq) GetRole() string { + if x != nil { + return x.Role + } + return "" +} + +func (x *UpdateUserVerificationsReq) GetStatus() string { + if x != nil { + return x.Status + } + return "" +} + +func (x *UpdateUserVerificationsReq) GetMaterials() string { + if x != nil { + return x.Materials + } + return "" +} + +func (x *UpdateUserVerificationsReq) GetRejectReason() string { + if x != nil { + return x.RejectReason + } + return "" +} + +func (x *UpdateUserVerificationsReq) GetReviewedBy() int64 { + if x != nil { + return x.ReviewedBy + } + return 0 +} + +func (x *UpdateUserVerificationsReq) GetReviewedAt() int64 { + if x != nil { + return x.ReviewedAt + } + return 0 +} + +func (x *UpdateUserVerificationsReq) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *UpdateUserVerificationsReq) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +type UpdateUserVerificationsResp struct { + state protoimpl.MessageState `protogen:"open.v1"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UpdateUserVerificationsResp) Reset() { + *x = UpdateUserVerificationsResp{} + mi := &file_user_verifications_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateUserVerificationsResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateUserVerificationsResp) ProtoMessage() {} + +func (x *UpdateUserVerificationsResp) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[4] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateUserVerificationsResp.ProtoReflect.Descriptor instead. +func (*UpdateUserVerificationsResp) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{4} +} + +type DelUserVerificationsReq struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` //id + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *DelUserVerificationsReq) Reset() { + *x = DelUserVerificationsReq{} + mi := &file_user_verifications_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DelUserVerificationsReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DelUserVerificationsReq) ProtoMessage() {} + +func (x *DelUserVerificationsReq) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[5] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DelUserVerificationsReq.ProtoReflect.Descriptor instead. +func (*DelUserVerificationsReq) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{5} +} + +func (x *DelUserVerificationsReq) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +type DelUserVerificationsResp struct { + state protoimpl.MessageState `protogen:"open.v1"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *DelUserVerificationsResp) Reset() { + *x = DelUserVerificationsResp{} + mi := &file_user_verifications_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *DelUserVerificationsResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DelUserVerificationsResp) ProtoMessage() {} + +func (x *DelUserVerificationsResp) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[6] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DelUserVerificationsResp.ProtoReflect.Descriptor instead. +func (*DelUserVerificationsResp) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{6} +} + +type GetUserVerificationsByIdReq struct { + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` //id + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *GetUserVerificationsByIdReq) Reset() { + *x = GetUserVerificationsByIdReq{} + mi := &file_user_verifications_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *GetUserVerificationsByIdReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetUserVerificationsByIdReq) ProtoMessage() {} + +func (x *GetUserVerificationsByIdReq) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[7] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetUserVerificationsByIdReq.ProtoReflect.Descriptor instead. +func (*GetUserVerificationsByIdReq) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{7} +} + +func (x *GetUserVerificationsByIdReq) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +type GetUserVerificationsByIdResp struct { + state protoimpl.MessageState `protogen:"open.v1"` + UserVerifications *UserVerifications `protobuf:"bytes,1,opt,name=userVerifications,proto3" json:"userVerifications,omitempty"` //userVerifications + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *GetUserVerificationsByIdResp) Reset() { + *x = GetUserVerificationsByIdResp{} + mi := &file_user_verifications_proto_msgTypes[8] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *GetUserVerificationsByIdResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GetUserVerificationsByIdResp) ProtoMessage() {} + +func (x *GetUserVerificationsByIdResp) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[8] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GetUserVerificationsByIdResp.ProtoReflect.Descriptor instead. +func (*GetUserVerificationsByIdResp) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{8} +} + +func (x *GetUserVerificationsByIdResp) GetUserVerifications() *UserVerifications { + if x != nil { + return x.UserVerifications + } + return nil +} + +type SearchUserVerificationsReq struct { + state protoimpl.MessageState `protogen:"open.v1"` + Page int64 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"` //page + Limit int64 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` //limit + Id int64 `protobuf:"varint,3,opt,name=id,proto3" json:"id,omitempty"` //id + UserId int64 `protobuf:"varint,4,opt,name=userId,proto3" json:"userId,omitempty"` //userId + Role string `protobuf:"bytes,5,opt,name=role,proto3" json:"role,omitempty"` //role + Status string `protobuf:"bytes,6,opt,name=status,proto3" json:"status,omitempty"` //status + Materials string `protobuf:"bytes,7,opt,name=materials,proto3" json:"materials,omitempty"` //materials + RejectReason string `protobuf:"bytes,8,opt,name=rejectReason,proto3" json:"rejectReason,omitempty"` //rejectReason + ReviewedBy int64 `protobuf:"varint,9,opt,name=reviewedBy,proto3" json:"reviewedBy,omitempty"` //reviewedBy + ReviewedAt int64 `protobuf:"varint,10,opt,name=reviewedAt,proto3" json:"reviewedAt,omitempty"` //reviewedAt + CreatedAt int64 `protobuf:"varint,11,opt,name=createdAt,proto3" json:"createdAt,omitempty"` //createdAt + UpdatedAt int64 `protobuf:"varint,12,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` //updatedAt + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SearchUserVerificationsReq) Reset() { + *x = SearchUserVerificationsReq{} + mi := &file_user_verifications_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SearchUserVerificationsReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SearchUserVerificationsReq) ProtoMessage() {} + +func (x *SearchUserVerificationsReq) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[9] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SearchUserVerificationsReq.ProtoReflect.Descriptor instead. +func (*SearchUserVerificationsReq) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{9} +} + +func (x *SearchUserVerificationsReq) GetPage() int64 { + if x != nil { + return x.Page + } + return 0 +} + +func (x *SearchUserVerificationsReq) GetLimit() int64 { + if x != nil { + return x.Limit + } + return 0 +} + +func (x *SearchUserVerificationsReq) GetId() int64 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *SearchUserVerificationsReq) GetUserId() int64 { + if x != nil { + return x.UserId + } + return 0 +} + +func (x *SearchUserVerificationsReq) GetRole() string { + if x != nil { + return x.Role + } + return "" +} + +func (x *SearchUserVerificationsReq) GetStatus() string { + if x != nil { + return x.Status + } + return "" +} + +func (x *SearchUserVerificationsReq) GetMaterials() string { + if x != nil { + return x.Materials + } + return "" +} + +func (x *SearchUserVerificationsReq) GetRejectReason() string { + if x != nil { + return x.RejectReason + } + return "" +} + +func (x *SearchUserVerificationsReq) GetReviewedBy() int64 { + if x != nil { + return x.ReviewedBy + } + return 0 +} + +func (x *SearchUserVerificationsReq) GetReviewedAt() int64 { + if x != nil { + return x.ReviewedAt + } + return 0 +} + +func (x *SearchUserVerificationsReq) GetCreatedAt() int64 { + if x != nil { + return x.CreatedAt + } + return 0 +} + +func (x *SearchUserVerificationsReq) GetUpdatedAt() int64 { + if x != nil { + return x.UpdatedAt + } + return 0 +} + +type SearchUserVerificationsResp struct { + state protoimpl.MessageState `protogen:"open.v1"` + UserVerifications []*UserVerifications `protobuf:"bytes,1,rep,name=userVerifications,proto3" json:"userVerifications,omitempty"` //userVerifications + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *SearchUserVerificationsResp) Reset() { + *x = SearchUserVerificationsResp{} + mi := &file_user_verifications_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *SearchUserVerificationsResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SearchUserVerificationsResp) ProtoMessage() {} + +func (x *SearchUserVerificationsResp) ProtoReflect() protoreflect.Message { + mi := &file_user_verifications_proto_msgTypes[10] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SearchUserVerificationsResp.ProtoReflect.Descriptor instead. +func (*SearchUserVerificationsResp) Descriptor() ([]byte, []int) { + return file_user_verifications_proto_rawDescGZIP(), []int{10} +} + +func (x *SearchUserVerificationsResp) GetUserVerifications() []*UserVerifications { + if x != nil { + return x.UserVerifications + } + return nil +} + +var File_user_verifications_proto protoreflect.FileDescriptor + +const file_user_verifications_proto_rawDesc = "" + + "\n" + + "\x18user_verifications.proto\x12\x02pb\"\xa5\x02\n" + + "\x11UserVerifications\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x16\n" + + "\x06userId\x18\x02 \x01(\x03R\x06userId\x12\x12\n" + + "\x04role\x18\x03 \x01(\tR\x04role\x12\x16\n" + + "\x06status\x18\x04 \x01(\tR\x06status\x12\x1c\n" + + "\tmaterials\x18\x05 \x01(\tR\tmaterials\x12\"\n" + + "\frejectReason\x18\x06 \x01(\tR\frejectReason\x12\x1e\n" + + "\n" + + "reviewedBy\x18\a \x01(\x03R\n" + + "reviewedBy\x12\x1e\n" + + "\n" + + "reviewedAt\x18\b \x01(\x03R\n" + + "reviewedAt\x12\x1c\n" + + "\tcreatedAt\x18\t \x01(\x03R\tcreatedAt\x12\x1c\n" + + "\tupdatedAt\x18\n" + + " \x01(\x03R\tupdatedAt\"\x9b\x02\n" + + "\x17AddUserVerificationsReq\x12\x16\n" + + "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x12\n" + + "\x04role\x18\x02 \x01(\tR\x04role\x12\x16\n" + + "\x06status\x18\x03 \x01(\tR\x06status\x12\x1c\n" + + "\tmaterials\x18\x04 \x01(\tR\tmaterials\x12\"\n" + + "\frejectReason\x18\x05 \x01(\tR\frejectReason\x12\x1e\n" + + "\n" + + "reviewedBy\x18\x06 \x01(\x03R\n" + + "reviewedBy\x12\x1e\n" + + "\n" + + "reviewedAt\x18\a \x01(\x03R\n" + + "reviewedAt\x12\x1c\n" + + "\tcreatedAt\x18\b \x01(\x03R\tcreatedAt\x12\x1c\n" + + "\tupdatedAt\x18\t \x01(\x03R\tupdatedAt\"\x1a\n" + + "\x18AddUserVerificationsResp\"\xae\x02\n" + + "\x1aUpdateUserVerificationsReq\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x16\n" + + "\x06userId\x18\x02 \x01(\x03R\x06userId\x12\x12\n" + + "\x04role\x18\x03 \x01(\tR\x04role\x12\x16\n" + + "\x06status\x18\x04 \x01(\tR\x06status\x12\x1c\n" + + "\tmaterials\x18\x05 \x01(\tR\tmaterials\x12\"\n" + + "\frejectReason\x18\x06 \x01(\tR\frejectReason\x12\x1e\n" + + "\n" + + "reviewedBy\x18\a \x01(\x03R\n" + + "reviewedBy\x12\x1e\n" + + "\n" + + "reviewedAt\x18\b \x01(\x03R\n" + + "reviewedAt\x12\x1c\n" + + "\tcreatedAt\x18\t \x01(\x03R\tcreatedAt\x12\x1c\n" + + "\tupdatedAt\x18\n" + + " \x01(\x03R\tupdatedAt\"\x1d\n" + + "\x1bUpdateUserVerificationsResp\")\n" + + "\x17DelUserVerificationsReq\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\"\x1a\n" + + "\x18DelUserVerificationsResp\"-\n" + + "\x1bGetUserVerificationsByIdReq\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\"c\n" + + "\x1cGetUserVerificationsByIdResp\x12C\n" + + "\x11userVerifications\x18\x01 \x01(\v2\x15.pb.UserVerificationsR\x11userVerifications\"\xd8\x02\n" + + "\x1aSearchUserVerificationsReq\x12\x12\n" + + "\x04page\x18\x01 \x01(\x03R\x04page\x12\x14\n" + + "\x05limit\x18\x02 \x01(\x03R\x05limit\x12\x0e\n" + + "\x02id\x18\x03 \x01(\x03R\x02id\x12\x16\n" + + "\x06userId\x18\x04 \x01(\x03R\x06userId\x12\x12\n" + + "\x04role\x18\x05 \x01(\tR\x04role\x12\x16\n" + + "\x06status\x18\x06 \x01(\tR\x06status\x12\x1c\n" + + "\tmaterials\x18\a \x01(\tR\tmaterials\x12\"\n" + + "\frejectReason\x18\b \x01(\tR\frejectReason\x12\x1e\n" + + "\n" + + "reviewedBy\x18\t \x01(\x03R\n" + + "reviewedBy\x12\x1e\n" + + "\n" + + "reviewedAt\x18\n" + + " \x01(\x03R\n" + + "reviewedAt\x12\x1c\n" + + "\tcreatedAt\x18\v \x01(\x03R\tcreatedAt\x12\x1c\n" + + "\tupdatedAt\x18\f \x01(\x03R\tupdatedAt\"b\n" + + "\x1bSearchUserVerificationsResp\x12C\n" + + "\x11userVerifications\x18\x01 \x03(\v2\x15.pb.UserVerificationsR\x11userVerifications2\xd1\x03\n" + + "\x12user_verifications\x12Q\n" + + "\x14AddUserVerifications\x12\x1b.pb.AddUserVerificationsReq\x1a\x1c.pb.AddUserVerificationsResp\x12Z\n" + + "\x17UpdateUserVerifications\x12\x1e.pb.UpdateUserVerificationsReq\x1a\x1f.pb.UpdateUserVerificationsResp\x12Q\n" + + "\x14DelUserVerifications\x12\x1b.pb.DelUserVerificationsReq\x1a\x1c.pb.DelUserVerificationsResp\x12]\n" + + "\x18GetUserVerificationsById\x12\x1f.pb.GetUserVerificationsByIdReq\x1a .pb.GetUserVerificationsByIdResp\x12Z\n" + + "\x17SearchUserVerifications\x12\x1e.pb.SearchUserVerificationsReq\x1a\x1f.pb.SearchUserVerificationsRespB\x06Z\x04./pbb\x06proto3" + +var ( + file_user_verifications_proto_rawDescOnce sync.Once + file_user_verifications_proto_rawDescData []byte +) + +func file_user_verifications_proto_rawDescGZIP() []byte { + file_user_verifications_proto_rawDescOnce.Do(func() { + file_user_verifications_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_user_verifications_proto_rawDesc), len(file_user_verifications_proto_rawDesc))) + }) + return file_user_verifications_proto_rawDescData +} + +var file_user_verifications_proto_msgTypes = make([]protoimpl.MessageInfo, 11) +var file_user_verifications_proto_goTypes = []any{ + (*UserVerifications)(nil), // 0: pb.UserVerifications + (*AddUserVerificationsReq)(nil), // 1: pb.AddUserVerificationsReq + (*AddUserVerificationsResp)(nil), // 2: pb.AddUserVerificationsResp + (*UpdateUserVerificationsReq)(nil), // 3: pb.UpdateUserVerificationsReq + (*UpdateUserVerificationsResp)(nil), // 4: pb.UpdateUserVerificationsResp + (*DelUserVerificationsReq)(nil), // 5: pb.DelUserVerificationsReq + (*DelUserVerificationsResp)(nil), // 6: pb.DelUserVerificationsResp + (*GetUserVerificationsByIdReq)(nil), // 7: pb.GetUserVerificationsByIdReq + (*GetUserVerificationsByIdResp)(nil), // 8: pb.GetUserVerificationsByIdResp + (*SearchUserVerificationsReq)(nil), // 9: pb.SearchUserVerificationsReq + (*SearchUserVerificationsResp)(nil), // 10: pb.SearchUserVerificationsResp +} +var file_user_verifications_proto_depIdxs = []int32{ + 0, // 0: pb.GetUserVerificationsByIdResp.userVerifications:type_name -> pb.UserVerifications + 0, // 1: pb.SearchUserVerificationsResp.userVerifications:type_name -> pb.UserVerifications + 1, // 2: pb.user_verifications.AddUserVerifications:input_type -> pb.AddUserVerificationsReq + 3, // 3: pb.user_verifications.UpdateUserVerifications:input_type -> pb.UpdateUserVerificationsReq + 5, // 4: pb.user_verifications.DelUserVerifications:input_type -> pb.DelUserVerificationsReq + 7, // 5: pb.user_verifications.GetUserVerificationsById:input_type -> pb.GetUserVerificationsByIdReq + 9, // 6: pb.user_verifications.SearchUserVerifications:input_type -> pb.SearchUserVerificationsReq + 2, // 7: pb.user_verifications.AddUserVerifications:output_type -> pb.AddUserVerificationsResp + 4, // 8: pb.user_verifications.UpdateUserVerifications:output_type -> pb.UpdateUserVerificationsResp + 6, // 9: pb.user_verifications.DelUserVerifications:output_type -> pb.DelUserVerificationsResp + 8, // 10: pb.user_verifications.GetUserVerificationsById:output_type -> pb.GetUserVerificationsByIdResp + 10, // 11: pb.user_verifications.SearchUserVerifications:output_type -> pb.SearchUserVerificationsResp + 7, // [7:12] is the sub-list for method output_type + 2, // [2:7] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name +} + +func init() { file_user_verifications_proto_init() } +func file_user_verifications_proto_init() { + if File_user_verifications_proto != nil { + return + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: unsafe.Slice(unsafe.StringData(file_user_verifications_proto_rawDesc), len(file_user_verifications_proto_rawDesc)), + NumEnums: 0, + NumMessages: 11, + NumExtensions: 0, + NumServices: 1, + }, + GoTypes: file_user_verifications_proto_goTypes, + DependencyIndexes: file_user_verifications_proto_depIdxs, + MessageInfos: file_user_verifications_proto_msgTypes, + }.Build() + File_user_verifications_proto = out.File + file_user_verifications_proto_goTypes = nil + file_user_verifications_proto_depIdxs = nil +} diff --git a/app/user_verifications/rpc/pb/user_verifications_grpc.pb.go b/app/user_verifications/rpc/pb/user_verifications_grpc.pb.go new file mode 100644 index 0000000..020be6a --- /dev/null +++ b/app/user_verifications/rpc/pb/user_verifications_grpc.pb.go @@ -0,0 +1,275 @@ +// Code generated by protoc-gen-go-grpc. DO NOT EDIT. +// versions: +// - protoc-gen-go-grpc v1.6.1 +// - protoc v5.29.6 +// source: user_verifications.proto + +package pb + +import ( + context "context" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" +) + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +// Requires gRPC-Go v1.64.0 or later. +const _ = grpc.SupportPackageIsVersion9 + +const ( + UserVerifications_AddUserVerifications_FullMethodName = "/pb.user_verifications/AddUserVerifications" + UserVerifications_UpdateUserVerifications_FullMethodName = "/pb.user_verifications/UpdateUserVerifications" + UserVerifications_DelUserVerifications_FullMethodName = "/pb.user_verifications/DelUserVerifications" + UserVerifications_GetUserVerificationsById_FullMethodName = "/pb.user_verifications/GetUserVerificationsById" + UserVerifications_SearchUserVerifications_FullMethodName = "/pb.user_verifications/SearchUserVerifications" +) + +// UserVerificationsClient is the client API for UserVerifications service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. +type UserVerificationsClient interface { + // -----------------------userVerifications----------------------- + AddUserVerifications(ctx context.Context, in *AddUserVerificationsReq, opts ...grpc.CallOption) (*AddUserVerificationsResp, error) + UpdateUserVerifications(ctx context.Context, in *UpdateUserVerificationsReq, opts ...grpc.CallOption) (*UpdateUserVerificationsResp, error) + DelUserVerifications(ctx context.Context, in *DelUserVerificationsReq, opts ...grpc.CallOption) (*DelUserVerificationsResp, error) + GetUserVerificationsById(ctx context.Context, in *GetUserVerificationsByIdReq, opts ...grpc.CallOption) (*GetUserVerificationsByIdResp, error) + SearchUserVerifications(ctx context.Context, in *SearchUserVerificationsReq, opts ...grpc.CallOption) (*SearchUserVerificationsResp, error) +} + +type userVerificationsClient struct { + cc grpc.ClientConnInterface +} + +func NewUserVerificationsClient(cc grpc.ClientConnInterface) UserVerificationsClient { + return &userVerificationsClient{cc} +} + +func (c *userVerificationsClient) AddUserVerifications(ctx context.Context, in *AddUserVerificationsReq, opts ...grpc.CallOption) (*AddUserVerificationsResp, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(AddUserVerificationsResp) + err := c.cc.Invoke(ctx, UserVerifications_AddUserVerifications_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *userVerificationsClient) UpdateUserVerifications(ctx context.Context, in *UpdateUserVerificationsReq, opts ...grpc.CallOption) (*UpdateUserVerificationsResp, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(UpdateUserVerificationsResp) + err := c.cc.Invoke(ctx, UserVerifications_UpdateUserVerifications_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *userVerificationsClient) DelUserVerifications(ctx context.Context, in *DelUserVerificationsReq, opts ...grpc.CallOption) (*DelUserVerificationsResp, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(DelUserVerificationsResp) + err := c.cc.Invoke(ctx, UserVerifications_DelUserVerifications_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *userVerificationsClient) GetUserVerificationsById(ctx context.Context, in *GetUserVerificationsByIdReq, opts ...grpc.CallOption) (*GetUserVerificationsByIdResp, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(GetUserVerificationsByIdResp) + err := c.cc.Invoke(ctx, UserVerifications_GetUserVerificationsById_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *userVerificationsClient) SearchUserVerifications(ctx context.Context, in *SearchUserVerificationsReq, opts ...grpc.CallOption) (*SearchUserVerificationsResp, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(SearchUserVerificationsResp) + err := c.cc.Invoke(ctx, UserVerifications_SearchUserVerifications_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +// UserVerificationsServer is the server API for UserVerifications service. +// All implementations must embed UnimplementedUserVerificationsServer +// for forward compatibility. +type UserVerificationsServer interface { + // -----------------------userVerifications----------------------- + AddUserVerifications(context.Context, *AddUserVerificationsReq) (*AddUserVerificationsResp, error) + UpdateUserVerifications(context.Context, *UpdateUserVerificationsReq) (*UpdateUserVerificationsResp, error) + DelUserVerifications(context.Context, *DelUserVerificationsReq) (*DelUserVerificationsResp, error) + GetUserVerificationsById(context.Context, *GetUserVerificationsByIdReq) (*GetUserVerificationsByIdResp, error) + SearchUserVerifications(context.Context, *SearchUserVerificationsReq) (*SearchUserVerificationsResp, error) + mustEmbedUnimplementedUserVerificationsServer() +} + +// UnimplementedUserVerificationsServer must be embedded to have +// forward compatible implementations. +// +// NOTE: this should be embedded by value instead of pointer to avoid a nil +// pointer dereference when methods are called. +type UnimplementedUserVerificationsServer struct{} + +func (UnimplementedUserVerificationsServer) AddUserVerifications(context.Context, *AddUserVerificationsReq) (*AddUserVerificationsResp, error) { + return nil, status.Error(codes.Unimplemented, "method AddUserVerifications not implemented") +} +func (UnimplementedUserVerificationsServer) UpdateUserVerifications(context.Context, *UpdateUserVerificationsReq) (*UpdateUserVerificationsResp, error) { + return nil, status.Error(codes.Unimplemented, "method UpdateUserVerifications not implemented") +} +func (UnimplementedUserVerificationsServer) DelUserVerifications(context.Context, *DelUserVerificationsReq) (*DelUserVerificationsResp, error) { + return nil, status.Error(codes.Unimplemented, "method DelUserVerifications not implemented") +} +func (UnimplementedUserVerificationsServer) GetUserVerificationsById(context.Context, *GetUserVerificationsByIdReq) (*GetUserVerificationsByIdResp, error) { + return nil, status.Error(codes.Unimplemented, "method GetUserVerificationsById not implemented") +} +func (UnimplementedUserVerificationsServer) SearchUserVerifications(context.Context, *SearchUserVerificationsReq) (*SearchUserVerificationsResp, error) { + return nil, status.Error(codes.Unimplemented, "method SearchUserVerifications not implemented") +} +func (UnimplementedUserVerificationsServer) mustEmbedUnimplementedUserVerificationsServer() {} +func (UnimplementedUserVerificationsServer) testEmbeddedByValue() {} + +// UnsafeUserVerificationsServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to UserVerificationsServer will +// result in compilation errors. +type UnsafeUserVerificationsServer interface { + mustEmbedUnimplementedUserVerificationsServer() +} + +func RegisterUserVerificationsServer(s grpc.ServiceRegistrar, srv UserVerificationsServer) { + // If the following call panics, it indicates UnimplementedUserVerificationsServer was + // embedded by pointer and is nil. This will cause panics if an + // unimplemented method is ever invoked, so we test this at initialization + // time to prevent it from happening at runtime later due to I/O. + if t, ok := srv.(interface{ testEmbeddedByValue() }); ok { + t.testEmbeddedByValue() + } + s.RegisterService(&UserVerifications_ServiceDesc, srv) +} + +func _UserVerifications_AddUserVerifications_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(AddUserVerificationsReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(UserVerificationsServer).AddUserVerifications(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: UserVerifications_AddUserVerifications_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(UserVerificationsServer).AddUserVerifications(ctx, req.(*AddUserVerificationsReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _UserVerifications_UpdateUserVerifications_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateUserVerificationsReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(UserVerificationsServer).UpdateUserVerifications(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: UserVerifications_UpdateUserVerifications_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(UserVerificationsServer).UpdateUserVerifications(ctx, req.(*UpdateUserVerificationsReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _UserVerifications_DelUserVerifications_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DelUserVerificationsReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(UserVerificationsServer).DelUserVerifications(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: UserVerifications_DelUserVerifications_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(UserVerificationsServer).DelUserVerifications(ctx, req.(*DelUserVerificationsReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _UserVerifications_GetUserVerificationsById_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetUserVerificationsByIdReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(UserVerificationsServer).GetUserVerificationsById(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: UserVerifications_GetUserVerificationsById_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(UserVerificationsServer).GetUserVerificationsById(ctx, req.(*GetUserVerificationsByIdReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _UserVerifications_SearchUserVerifications_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SearchUserVerificationsReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(UserVerificationsServer).SearchUserVerifications(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: UserVerifications_SearchUserVerifications_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(UserVerificationsServer).SearchUserVerifications(ctx, req.(*SearchUserVerificationsReq)) + } + return interceptor(ctx, in, info, handler) +} + +// UserVerifications_ServiceDesc is the grpc.ServiceDesc for UserVerifications service. +// It's only intended for direct use with grpc.RegisterService, +// and not to be introspected or modified (even as a copy) +var UserVerifications_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "pb.user_verifications", + HandlerType: (*UserVerificationsServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "AddUserVerifications", + Handler: _UserVerifications_AddUserVerifications_Handler, + }, + { + MethodName: "UpdateUserVerifications", + Handler: _UserVerifications_UpdateUserVerifications_Handler, + }, + { + MethodName: "DelUserVerifications", + Handler: _UserVerifications_DelUserVerifications_Handler, + }, + { + MethodName: "GetUserVerificationsById", + Handler: _UserVerifications_GetUserVerificationsById_Handler, + }, + { + MethodName: "SearchUserVerifications", + Handler: _UserVerifications_SearchUserVerifications_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "user_verifications.proto", +} diff --git a/app/user_verifications/rpc/userverifications/userVerifications.go b/app/user_verifications/rpc/userverifications/userVerifications.go new file mode 100644 index 0000000..ed4eff4 --- /dev/null +++ b/app/user_verifications/rpc/userverifications/userVerifications.go @@ -0,0 +1,73 @@ +// Code generated by goctl. DO NOT EDIT. +// goctl 1.9.2 +// Source: user_verifications.proto + +package userverifications + +import ( + "context" + + "juwan-backend/app/user_verifications/rpc/pb" + + "github.com/zeromicro/go-zero/zrpc" + "google.golang.org/grpc" +) + +type ( + AddUserVerificationsReq = pb.AddUserVerificationsReq + AddUserVerificationsResp = pb.AddUserVerificationsResp + DelUserVerificationsReq = pb.DelUserVerificationsReq + DelUserVerificationsResp = pb.DelUserVerificationsResp + GetUserVerificationsByIdReq = pb.GetUserVerificationsByIdReq + GetUserVerificationsByIdResp = pb.GetUserVerificationsByIdResp + SearchUserVerificationsReq = pb.SearchUserVerificationsReq + SearchUserVerificationsResp = pb.SearchUserVerificationsResp + UpdateUserVerificationsReq = pb.UpdateUserVerificationsReq + UpdateUserVerificationsResp = pb.UpdateUserVerificationsResp + UserVerifications = pb.UserVerifications + + UserVerificationsZrpcClient interface { + // -----------------------userVerifications----------------------- + AddUserVerifications(ctx context.Context, in *AddUserVerificationsReq, opts ...grpc.CallOption) (*AddUserVerificationsResp, error) + UpdateUserVerifications(ctx context.Context, in *UpdateUserVerificationsReq, opts ...grpc.CallOption) (*UpdateUserVerificationsResp, error) + DelUserVerifications(ctx context.Context, in *DelUserVerificationsReq, opts ...grpc.CallOption) (*DelUserVerificationsResp, error) + GetUserVerificationsById(ctx context.Context, in *GetUserVerificationsByIdReq, opts ...grpc.CallOption) (*GetUserVerificationsByIdResp, error) + SearchUserVerifications(ctx context.Context, in *SearchUserVerificationsReq, opts ...grpc.CallOption) (*SearchUserVerificationsResp, error) + } + + defaultUserVerificationsZrpcClient struct { + cli zrpc.Client + } +) + +func NewUserVerificationsZrpcClient(cli zrpc.Client) UserVerificationsZrpcClient { + return &defaultUserVerificationsZrpcClient{ + cli: cli, + } +} + +// -----------------------userVerifications----------------------- +func (m *defaultUserVerificationsZrpcClient) AddUserVerifications(ctx context.Context, in *AddUserVerificationsReq, opts ...grpc.CallOption) (*AddUserVerificationsResp, error) { + client := pb.NewUserVerificationsClient(m.cli.Conn()) + return client.AddUserVerifications(ctx, in, opts...) +} + +func (m *defaultUserVerificationsZrpcClient) UpdateUserVerifications(ctx context.Context, in *UpdateUserVerificationsReq, opts ...grpc.CallOption) (*UpdateUserVerificationsResp, error) { + client := pb.NewUserVerificationsClient(m.cli.Conn()) + return client.UpdateUserVerifications(ctx, in, opts...) +} + +func (m *defaultUserVerificationsZrpcClient) DelUserVerifications(ctx context.Context, in *DelUserVerificationsReq, opts ...grpc.CallOption) (*DelUserVerificationsResp, error) { + client := pb.NewUserVerificationsClient(m.cli.Conn()) + return client.DelUserVerifications(ctx, in, opts...) +} + +func (m *defaultUserVerificationsZrpcClient) GetUserVerificationsById(ctx context.Context, in *GetUserVerificationsByIdReq, opts ...grpc.CallOption) (*GetUserVerificationsByIdResp, error) { + client := pb.NewUserVerificationsClient(m.cli.Conn()) + return client.GetUserVerificationsById(ctx, in, opts...) +} + +func (m *defaultUserVerificationsZrpcClient) SearchUserVerifications(ctx context.Context, in *SearchUserVerificationsReq, opts ...grpc.CallOption) (*SearchUserVerificationsResp, error) { + client := pb.NewUserVerificationsClient(m.cli.Conn()) + return client.SearchUserVerifications(ctx, in, opts...) +} diff --git a/app/users/api/internal/contextx/contextx.go b/app/users/api/internal/contextx/contextx.go index 50a1de9..cfed81d 100644 --- a/app/users/api/internal/contextx/contextx.go +++ b/app/users/api/internal/contextx/contextx.go @@ -28,3 +28,27 @@ func TokenFrom(c context.Context) (string, error) { } return token, nil } + +func WithUserID(c context.Context, id int64) context.Context { + return context.WithValue(c, "user_id", id) +} + +func UserIDFrom(c context.Context) (int64, error) { + if userID, ok := c.Value("user_id").(int64); !ok { + return 0, errors.New("user_id not found in context") + } else { + return userID, nil + } +} + +func WithRequestID(c context.Context, requestID string) context.Context { + return context.WithValue(c, "request_id", requestID) +} + +func RequestIDFrom(c context.Context) (string, error) { + if requestID, ok := c.Value("request_id").(string); !ok { + return "", errors.New("request_id not found in context") + } else { + return requestID, nil + } +} diff --git a/app/users/api/internal/handler/routes.go b/app/users/api/internal/handler/routes.go index 9d380a8..ea2b386 100644 --- a/app/users/api/internal/handler/routes.go +++ b/app/users/api/internal/handler/routes.go @@ -17,18 +17,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { rest.WithMiddlewares( []rest.Middleware{serverCtx.Logger}, []rest.Route{ - { - // 获取用户信息 - Method: http.MethodGet, - Path: "/:userId", - Handler: user.GetUserInfoHandler(serverCtx), - }, - { - // 修改用户信息 - Method: http.MethodPut, - Path: "/:userId", - Handler: user.UpdateUserInfoHandler(serverCtx), - }, { // 用户登出 Method: http.MethodPost, @@ -41,6 +29,12 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Path: "/:userId/password", Handler: user.UpdatePasswordHandler(serverCtx), }, + { + // 修改密码-使用验证码 + Method: http.MethodPut, + Path: "/forgot-password/reset", + Handler: user.UpdatePasswordByVcodeHandler(serverCtx), + }, { // 用户登录接口 Method: http.MethodPost, @@ -55,6 +49,39 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { }, }..., ), - rest.WithPrefix("/api/users"), + rest.WithPrefix("/api/v1/auth"), + ) + + server.AddRoutes( + rest.WithMiddlewares( + []rest.Middleware{serverCtx.Logger}, + []rest.Route{ + { + // 获取用户信息 + Method: http.MethodGet, + Path: "/:userId", + Handler: user.GetUserInfoHandler(serverCtx), + }, + { + // 修改用户信息 + Method: http.MethodPut, + Path: "/:userId", + Handler: user.UpdateUserInfoHandler(serverCtx), + }, + { + // 获取当前登录用户信息 + Method: http.MethodGet, + Path: "/me", + Handler: user.GetMeHandler(serverCtx), + }, + { + // 更改当前登录用户信息 + Method: http.MethodPut, + Path: "/me", + Handler: user.UpdateMeHandler(serverCtx), + }, + }..., + ), + rest.WithPrefix("/api/v1/user"), ) } diff --git a/app/users/api/internal/handler/user/getMeHandler.go b/app/users/api/internal/handler/user/getMeHandler.go new file mode 100644 index 0000000..8bc8be8 --- /dev/null +++ b/app/users/api/internal/handler/user/getMeHandler.go @@ -0,0 +1,30 @@ +// Code scaffolded by goctl. Safe to edit. +// goctl 1.9.2 + +package user + +import ( + "net/http" + + "juwan-backend/app/users/api/internal/logic/user" + "juwan-backend/app/users/api/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" +) + +// 获取当前登录用户信息 +func GetMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + l := user.NewGetMeLogic(r.Context(), svcCtx) + resp, err := l.GetMe() + logx.Infof("req header: %v", r.Header) + logx.Infof("cookies: %v", r.Cookies()) + //r.Cookie() + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/app/users/api/internal/handler/user/loginHandler.go b/app/users/api/internal/handler/user/loginHandler.go index 5ab1abe..ef7032b 100644 --- a/app/users/api/internal/handler/user/loginHandler.go +++ b/app/users/api/internal/handler/user/loginHandler.go @@ -7,6 +7,7 @@ import ( "juwan-backend/app/users/api/internal/logic/user" "juwan-backend/app/users/api/internal/svc" "juwan-backend/app/users/api/internal/types" + "juwan-backend/common/utils" "net/http" "github.com/zeromicro/go-zero/rest/httpx" @@ -25,7 +26,7 @@ func LoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { resp, err := l.Login(&req) if err != nil { - httpx.ErrorCtx(r.Context(), w, err) + httpx.ErrorCtx(r.Context(), w, utils.NewErrorResp(400, err)) } else { token := resp.Token resp.Token = "" diff --git a/app/users/api/internal/handler/user/updateMeHandler.go b/app/users/api/internal/handler/user/updateMeHandler.go new file mode 100644 index 0000000..1702c99 --- /dev/null +++ b/app/users/api/internal/handler/user/updateMeHandler.go @@ -0,0 +1,32 @@ +// Code scaffolded by goctl. Safe to edit. +// goctl 1.9.2 + +package user + +import ( + "net/http" + + "github.com/zeromicro/go-zero/rest/httpx" + "juwan-backend/app/users/api/internal/logic/user" + "juwan-backend/app/users/api/internal/svc" + "juwan-backend/app/users/api/internal/types" +) + +// 更改当前登录用户信息 +func UpdateMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.UpdateUserInfoReq + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := user.NewUpdateMeLogic(r.Context(), svcCtx) + resp, err := l.UpdateMe(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/app/users/api/internal/handler/user/updatePasswordByVcodeHandler.go b/app/users/api/internal/handler/user/updatePasswordByVcodeHandler.go new file mode 100644 index 0000000..189ab43 --- /dev/null +++ b/app/users/api/internal/handler/user/updatePasswordByVcodeHandler.go @@ -0,0 +1,32 @@ +// Code scaffolded by goctl. Safe to edit. +// goctl 1.9.2 + +package user + +import ( + "net/http" + + "github.com/zeromicro/go-zero/rest/httpx" + "juwan-backend/app/users/api/internal/logic/user" + "juwan-backend/app/users/api/internal/svc" + "juwan-backend/app/users/api/internal/types" +) + +// 修改密码-使用验证码 +func UpdatePasswordByVcodeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.ResetPasswordByVcode + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := user.NewUpdatePasswordByVcodeLogic(r.Context(), svcCtx) + resp, err := l.UpdatePasswordByVcode(&req) + if err != nil { + httpx.ErrorCtx(r.Context(), w, err) + } else { + httpx.OkJsonCtx(r.Context(), w, resp) + } + } +} diff --git a/app/users/api/internal/logic/user/getMeLogic.go b/app/users/api/internal/logic/user/getMeLogic.go new file mode 100644 index 0000000..a291f33 --- /dev/null +++ b/app/users/api/internal/logic/user/getMeLogic.go @@ -0,0 +1,50 @@ +// Code scaffolded by goctl. Safe to edit. +// goctl 1.9.2 + +package user + +import ( + "context" + "errors" + "juwan-backend/app/users/api/internal/contextx" + "juwan-backend/app/users/rpc/usercenter" + "juwan-backend/common/converter" + + "juwan-backend/app/users/api/internal/svc" + "juwan-backend/app/users/api/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type GetMeLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +// 获取当前登录用户信息 +func NewGetMeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetMeLogic { + return &GetMeLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *GetMeLogic) GetMe() (resp *types.UserInfo, err error) { + userId, err := contextx.UserIDFrom(l.ctx) + if err != nil { + return nil, errors.New("illegal id") + } + user, err := l.svcCtx.UserRpc.GetUsersById(l.ctx, &usercenter.GetUsersByIdReq{ + Id: userId, + }) + if err != nil { + return nil, errors.New("get user by id error") + } + err = converter.StructToStruct(user, &resp) + if err != nil { + return nil, errors.New("to struct error") + } + return +} diff --git a/app/users/api/internal/logic/user/getUserInfoLogic.go b/app/users/api/internal/logic/user/getUserInfoLogic.go index dda2297..e427495 100644 --- a/app/users/api/internal/logic/user/getUserInfoLogic.go +++ b/app/users/api/internal/logic/user/getUserInfoLogic.go @@ -31,7 +31,7 @@ func NewGetUserInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUs } func (l *GetUserInfoLogic) GetUserInfo(req *types.GetUserInfoReq) (resp types.UserInfo, err error) { - // todo: add your logic here and delete this line + pbUser, err := l.svcCtx.UserRpc.GetUsersById(l.ctx, &usercenter.GetUsersByIdReq{ Id: req.UserId, }) diff --git a/app/users/api/internal/logic/user/loginLogic.go b/app/users/api/internal/logic/user/loginLogic.go index 767c8b8..1d12dca 100644 --- a/app/users/api/internal/logic/user/loginLogic.go +++ b/app/users/api/internal/logic/user/loginLogic.go @@ -30,7 +30,7 @@ func NewLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LoginLogic } func (l *LoginLogic) Login(req *types.LoginReq) (resp *types.LoginResp, err error) { - if len(req.Username) < 3 || len(req.Password) > 20 || len(req.Password) < 8 || len(req.Password) > 20 { + if len(req.Username) < 3 || len(req.Password) < 8 || len(req.Password) > 20 { return nil, errors.New("the information is illegal") } diff --git a/app/users/api/internal/logic/user/updateMeLogic.go b/app/users/api/internal/logic/user/updateMeLogic.go new file mode 100644 index 0000000..4690fb9 --- /dev/null +++ b/app/users/api/internal/logic/user/updateMeLogic.go @@ -0,0 +1,55 @@ +// Code scaffolded by goctl. Safe to edit. +// goctl 1.9.2 + +package user + +import ( + "context" + "errors" + "juwan-backend/app/users/api/internal/contextx" + "juwan-backend/app/users/rpc/usercenter" + "juwan-backend/common/converter" + + "juwan-backend/app/users/api/internal/svc" + "juwan-backend/app/users/api/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type UpdateMeLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +// 更改当前登录用户信息 +func NewUpdateMeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateMeLogic { + return &UpdateMeLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *UpdateMeLogic) UpdateMe(req *types.UpdateUserInfoReq) (resp *types.UserInfo, err error) { + userId, err := contextx.UserIDFrom(l.ctx) + if err != nil { + return nil, err + } + res, err := l.svcCtx.UserRpc.UpdateUsers(l.ctx, &usercenter.UpdateUsersReq{ + Id: userId, + Nickname: req.Nickname, + Avatar: req.Avatar, + Bio: req.Bio, + VerifiedRoles: nil, + }) + if err != nil { + return nil, errors.New("update info failed") + } + err = converter.StructToStruct(res, &resp) + if err != nil { + logx.Errorf("unmarshal user info failed, err:%v.", err) + return nil, errors.New("unmarshal user info failed") + } + return +} diff --git a/app/users/api/internal/logic/user/updatePasswordByVcodeLogic.go b/app/users/api/internal/logic/user/updatePasswordByVcodeLogic.go new file mode 100644 index 0000000..8f64f51 --- /dev/null +++ b/app/users/api/internal/logic/user/updatePasswordByVcodeLogic.go @@ -0,0 +1,58 @@ +// Code scaffolded by goctl. Safe to edit. +// goctl 1.9.2 + +package user + +import ( + "context" + "errors" + "juwan-backend/app/users/api/internal/contextx" + "juwan-backend/app/users/rpc/usercenter" + "juwan-backend/common/utils" + + "juwan-backend/app/users/api/internal/svc" + "juwan-backend/app/users/api/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type UpdatePasswordByVcodeLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +// 修改密码-使用验证码 +func NewUpdatePasswordByVcodeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdatePasswordByVcodeLogic { + return &UpdatePasswordByVcodeLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *UpdatePasswordByVcodeLogic) UpdatePasswordByVcode(req *types.ResetPasswordByVcode) (resp *types.EmptyResp, err error) { + // todo: add your logic here and delete this line + requestId, err := contextx.RequestIdFrom(l.ctx) + if err != nil { + logx.Errorf("get request id from context failed, err:%v.", err) + return nil, errors.New("bad request") + } + hashedPassword, err := utils.HashPassword(req.Password) + if err != nil { + logx.Errorf("hash password failed, err:%v.", err) + return nil, errors.New("bad password") + } + + _, err = l.svcCtx.UserRpc.ResetPassword(l.ctx, &usercenter.ResetPasswordReq{ + NewPassword: hashedPassword, + Email: req.Email, + RequestId: requestId, + Vcode: req.Vcode, + }) + if err != nil { + logx.Errorf("reset password failed, err:%v.", err) + return nil, errors.New("reset password failed") + } + return +} diff --git a/app/users/api/internal/logic/user/updatePasswordLogic.go b/app/users/api/internal/logic/user/updatePasswordLogic.go index b418e30..790c55a 100644 --- a/app/users/api/internal/logic/user/updatePasswordLogic.go +++ b/app/users/api/internal/logic/user/updatePasswordLogic.go @@ -5,6 +5,10 @@ package user import ( "context" + "errors" + "juwan-backend/app/users/api/internal/contextx" + "juwan-backend/app/users/rpc/usercenter" + "juwan-backend/common/utils" "juwan-backend/app/users/api/internal/svc" "juwan-backend/app/users/api/internal/types" @@ -12,6 +16,8 @@ import ( "github.com/zeromicro/go-zero/core/logx" ) +var ChangeUserPassFailed = errors.New("change user pass failed") + type UpdatePasswordLogic struct { logx.Logger ctx context.Context @@ -29,6 +35,38 @@ func NewUpdatePasswordLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Up func (l *UpdatePasswordLogic) UpdatePassword(req *types.UpdatePasswordReq) (resp *types.UpdatePasswordResp, err error) { // todo: add your logic here and delete this line + userId, err := contextx.UserIDFrom(l.ctx) + if err != nil { + logx.Errorf("get user id from context failed, err:%v.", err) + return nil, ChangeUserPassFailed + } + user, err := l.svcCtx.UserRpc.GetUsersById(l.ctx, &usercenter.GetUsersByIdReq{ + Id: userId, + }) + if err != nil { + logx.Errorf("get user info failed, err:%v.", err) + return nil, ChangeUserPassFailed + } + + oldPasswd, err := utils.HashPassword(req.OldPassword) + if err != nil { + logx.Errorf("hash old password failed, err:%v.", err) + return nil, ChangeUserPassFailed + } + + if oldPasswd != user.Users.PasswordHash { + return nil, ChangeUserPassFailed + } + + _, err = l.svcCtx.UserRpc.UpdateUsers(l.ctx, &usercenter.UpdateUsersReq{ + Id: userId, + Username: &user.Users.Username, + PasswordHash: &req.NewPassword, + }) + if err != nil { + logx.Errorf("update user password failed, err:%v.", err) + return nil, ChangeUserPassFailed + } return } diff --git a/app/users/api/internal/logic/user/updateUserInfoLogic.go b/app/users/api/internal/logic/user/updateUserInfoLogic.go index e3d87cc..d517698 100644 --- a/app/users/api/internal/logic/user/updateUserInfoLogic.go +++ b/app/users/api/internal/logic/user/updateUserInfoLogic.go @@ -5,6 +5,9 @@ package user import ( "context" + "errors" + "juwan-backend/app/users/api/internal/contextx" + "juwan-backend/app/users/rpc/usercenter" "juwan-backend/app/users/api/internal/svc" "juwan-backend/app/users/api/internal/types" @@ -28,7 +31,18 @@ func NewUpdateUserInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Up } func (l *UpdateUserInfoLogic) UpdateUserInfo(req *types.UpdateUserInfoReq) (resp *types.UpdateUserInfoResp, err error) { - // todo: add your logic here and delete this line - + userId, err := contextx.UserIDFrom(l.ctx) + if err != nil { + return nil, errors.New("user not found") + } + _, err = l.svcCtx.UserRpc.UpdateUsers(l.ctx, &usercenter.UpdateUsersReq{ + Id: userId, + Nickname: req.Nickname, + Avatar: req.Avatar, + Bio: req.Bio, + }) + if err != nil { + return nil, errors.New("update user info failed") + } return } diff --git a/app/users/api/internal/types/types.go b/app/users/api/internal/types/types.go index 6ddf4dc..f6944b4 100644 --- a/app/users/api/internal/types/types.go +++ b/app/users/api/internal/types/types.go @@ -3,6 +3,9 @@ package types +type EmptyResp struct { +} + type ErrorResp struct { Code int `json:"code"` Message string `json:"message"` @@ -49,6 +52,12 @@ type RegisterResp struct { Message string `json:"message"` } +type ResetPasswordByVcode struct { + Email string `json:"email"` + Password string `json:"password"` + Vcode string `json:"vcode"` +} + type UpdatePasswordReq struct { UserId int64 `path:"userId" binding:"required,gt=0"` OldPassword string `json:"oldPassword" binding:"required"` @@ -60,10 +69,9 @@ type UpdatePasswordResp struct { } type UpdateUserInfoReq struct { - UserId int64 `path:"userId" binding:"required,gt=0"` - Email string `json:"email" binding:"omitempty,email"` - Phone string `json:"phone" binding:"omitempty,len=11"` - Avatar string `json:"avatar" binding:"omitempty,url"` + Nickname *string `json:"nickname,omitempty"` + Avatar *string `json:"avatar,omitempty"` + Bio *string `json:"bio,omitempty"` } type UpdateUserInfoResp struct { diff --git a/app/users/rpc/internal/logic/getUserByUsernameLogic.go b/app/users/rpc/internal/logic/getUserByUsernameLogic.go index 7b9a657..f090256 100644 --- a/app/users/rpc/internal/logic/getUserByUsernameLogic.go +++ b/app/users/rpc/internal/logic/getUserByUsernameLogic.go @@ -2,6 +2,7 @@ package logic import ( "context" + "juwan-backend/app/users/rpc/internal/models/users" "juwan-backend/app/users/rpc/internal/svc" "juwan-backend/app/users/rpc/pb" @@ -25,9 +26,10 @@ func NewGetUserByUsernameLogic(ctx context.Context, svcCtx *svc.ServiceContext) } func (l *GetUserByUsernameLogic) GetUserByUsername(in *pb.GetUserByUsernameReq) (*pb.GetUserByUsernameResp, error) { - user, err := l.svcCtx.UsersModelRO.FindOneByUsername(l.ctx, in.Username) pbUsers := &pb.Users{} - converter.StructToStruct(user, pbUsers) + + //user, err := l.svcCtx.UsersModelRO.FindOneByUsername(l.ctx, in.Username) + user, err := l.svcCtx.UsersModelRO.Query().Where(users.UsernameEQ(in.Username)).First(l.ctx) if err == nil || user != nil { return &pb.GetUserByUsernameResp{ Users: pbUsers, @@ -36,5 +38,10 @@ func (l *GetUserByUsernameLogic) GetUserByUsername(in *pb.GetUserByUsernameReq) if err.Error() != "not found" { return nil, err } + + err = converter.StructToStruct(user, pbUsers) + if err != nil { + return nil, err + } return &pb.GetUserByUsernameResp{}, nil } diff --git a/app/users/rpc/internal/logic/getUsersByIdLogic.go b/app/users/rpc/internal/logic/getUsersByIdLogic.go index a471785..29b7f32 100644 --- a/app/users/rpc/internal/logic/getUsersByIdLogic.go +++ b/app/users/rpc/internal/logic/getUsersByIdLogic.go @@ -2,6 +2,7 @@ package logic import ( "context" + "juwan-backend/app/users/rpc/internal/models/users" "juwan-backend/app/users/rpc/internal/svc" "juwan-backend/app/users/rpc/pb" @@ -26,12 +27,16 @@ func NewGetUsersByIdLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetU func (l *GetUsersByIdLogic) GetUsersById(in *pb.GetUsersByIdReq) (*pb.GetUsersByIdResp, error) { // todo: add your logic here and delete this line - user, err := l.svcCtx.UsersModelRO.FindOne(l.ctx, in.Id) + //user, err := l.svcCtx.UsersModelRO.FindOne(l.ctx, in.Id) + user, err := l.svcCtx.UsersModelRO.Query().Where(users.IDEQ(in.Id)).All(l.ctx) if err != nil { return nil, err } pbUser := &pb.Users{} - converter.StructToStruct(&user, &pbUser) + err = converter.StructToStruct(&user, &pbUser) + if err != nil { + return nil, err + } return &pb.GetUsersByIdResp{Users: pbUser}, nil } diff --git a/app/users/rpc/internal/logic/loginLogic.go b/app/users/rpc/internal/logic/loginLogic.go index 46fb8ee..93f7caf 100644 --- a/app/users/rpc/internal/logic/loginLogic.go +++ b/app/users/rpc/internal/logic/loginLogic.go @@ -3,6 +3,7 @@ package logic import ( "context" "errors" + "juwan-backend/app/users/rpc/internal/models/users" "juwan-backend/app/users/rpc/internal/svc" utils2 "juwan-backend/app/users/rpc/internal/utils" "juwan-backend/app/users/rpc/pb" @@ -11,6 +12,8 @@ import ( "github.com/zeromicro/go-zero/core/logx" ) +//var UserNotFound = errors.New("user not Found") + type LoginLogic struct { ctx context.Context svcCtx *svc.ServiceContext @@ -26,23 +29,24 @@ func NewLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LoginLogic } func (l *LoginLogic) Login(in *pb.LoginReq) (*pb.LoginResp, error) { - user, err := l.svcCtx.UsersModelRO.FindOneByUsername(l.ctx, in.Username) + //user, err := l.svcCtx.UsersModelRO.FindOneByUsername(l.ctx, in.Username) + user, err := l.svcCtx.UsersModelRO.Query().Where(users.NicknameEQ(in.Username)).First(l.ctx) if err != nil { logx.WithContext(l.ctx).Errorf("LoginLogic.Login error:%v", err) return nil, err } logx.Infof("user:%v", user) - if !utils.VerifyPassword(user.Passwd, in.Passwd) { + if !utils.VerifyPassword(user.PasswordHash, in.Passwd) { logx.WithContext(l.ctx).Errorf("User %s Login failed", user.Username) return nil, errors.New("incorrect password") } token, err := l.svcCtx.JwtManager.New(l.ctx, &utils2.TokenPayload{ - UserId: user.UserId, + UserId: user.ID, IsAdmin: false, }) if err != nil { - logx.Errorf("LoginLogic.Login gen jwt for user %v error:%v", user.UserId, err) + logx.Errorf("LoginLogic.Login gen jwt for user %v error:%v", user.ID, err) return nil, err } @@ -50,6 +54,6 @@ func (l *LoginLogic) Login(in *pb.LoginReq) (*pb.LoginResp, error) { Token: token, Username: user.Username, Email: user.Email, - Id: user.UserId, + Id: user.ID, }, nil } diff --git a/app/users/rpc/internal/logic/registerLogic.go b/app/users/rpc/internal/logic/registerLogic.go index f86fd5a..0c33d2f 100644 --- a/app/users/rpc/internal/logic/registerLogic.go +++ b/app/users/rpc/internal/logic/registerLogic.go @@ -6,13 +6,12 @@ import ( "encoding/hex" "errors" "fmt" - "strconv" - "strings" - "juwan-backend/app/snowflake/rpc/snowflake" - "juwan-backend/app/users/rpc/internal/models" "juwan-backend/app/users/rpc/internal/svc" "juwan-backend/app/users/rpc/pb" + "juwan-backend/common/redisx" + "strconv" + "strings" "github.com/zeromicro/go-zero/core/logx" ) @@ -44,13 +43,12 @@ func mustNewRandomNickname() string { } func (l *RegisterLogic) Register(in *pb.RegisterReq) (*pb.RegisterResp, error) { - // todo: add your logic here and delete this line - if in.Phone == "" || in.Username == "" || in.Passwd == "" { + if in.Username == "" || in.Passwd == "" { logx.Error("invalid input") return nil, errors.New("invalid input") } - redisKey := fmt.Sprintf("vcode:%s:%s:%s", in.RequestId, "register", in.Email) + redisKey := fmt.Sprintf(redisx.VCODE_KEY_PREFIX, in.RequestId, redisx.SCENE_REG, in.Email) vcode, err := l.svcCtx.RedisCluster.Get(l.ctx, redisKey).Result() logx.Infof("vcode:%s, err:%v", vcode, err) if err != nil { @@ -69,21 +67,17 @@ func (l *RegisterLogic) Register(in *pb.RegisterReq) (*pb.RegisterResp, error) { return nil, errors.New("generate user ID failed") } - user := models.Users{ - UserId: resp.Id, - Username: in.Username, - Nickname: mustNewRandomNickname(), - Passwd: in.Passwd, - Phone: in.Phone, - Email: in.Email, - RoleType: 0, - IsVerified: false, - } - - _, err = l.svcCtx.UsersModelRW.Insert(l.ctx, &user) + _, err = l.svcCtx.UsersModelRW.Create(). + SetID(resp.Id). + SetUsername(in.Username). + SetPasswordHash(in.Passwd). + SetPhone(in.Phone). + SetEmail(in.Email). + SetNickname(mustNewRandomNickname()). + Save(l.ctx) if err != nil { - logx.Error("failed to create user: ", err) - return nil, errors.New("failed to create user") + logx.Errorf("create user err:%v", err) + return nil, err } return &pb.RegisterResp{ diff --git a/app/users/rpc/internal/logic/resetPasswordLogic.go b/app/users/rpc/internal/logic/resetPasswordLogic.go new file mode 100644 index 0000000..591070e --- /dev/null +++ b/app/users/rpc/internal/logic/resetPasswordLogic.go @@ -0,0 +1,49 @@ +package logic + +import ( + "context" + "errors" + "fmt" + "juwan-backend/app/users/rpc/internal/models/users" + "juwan-backend/common/redisx" + + "juwan-backend/app/users/rpc/internal/svc" + "juwan-backend/app/users/rpc/pb" + + "github.com/zeromicro/go-zero/core/logx" +) + +type ResetPasswordLogic struct { + ctx context.Context + svcCtx *svc.ServiceContext + logx.Logger +} + +func NewResetPasswordLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ResetPasswordLogic { + return &ResetPasswordLogic{ + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), + } +} + +func (l *ResetPasswordLogic) ResetPassword(in *pb.ResetPasswordReq) (*pb.ResetPasswordResp, error) { + // todo: add your logic here and delete this line + redisKey := fmt.Sprintf(redisx.VCODE_KEY_PREFIX, in.RequestId, redisx.SCENE_REG, in.Email) + vcode, err := l.svcCtx.RedisCluster.Get(l.ctx, redisKey).Result() + if err != nil { + logx.Errorf("get reset password vcode from redis failed, err:%v.", err) + return nil, err + } + if vcode != in.Vcode { + return nil, errors.New(fmt.Sprintf("user %v reset password failed, invalid vcode.", in.Email)) + } + err = l.svcCtx.UsersModelRW.Update().Where(users.EmailEQ(in.Email)). + SetPasswordHash(in.NewPassword). + Exec(l.ctx) + if err != nil { + logx.Errorf("reset password failed, err:%v.", err) + return nil, errors.New("reset password failed") + } + return &pb.ResetPasswordResp{}, nil +} diff --git a/app/users/rpc/internal/logic/searchUsersLogic.go b/app/users/rpc/internal/logic/searchUsersLogic.go index 59e566e..4e518e0 100644 --- a/app/users/rpc/internal/logic/searchUsersLogic.go +++ b/app/users/rpc/internal/logic/searchUsersLogic.go @@ -2,10 +2,14 @@ package logic import ( "context" - + "encoding/json" + "errors" + "juwan-backend/app/users/rpc/internal/models" + "juwan-backend/app/users/rpc/internal/models/users" "juwan-backend/app/users/rpc/internal/svc" "juwan-backend/app/users/rpc/pb" + "github.com/jinzhu/copier" "github.com/zeromicro/go-zero/core/logx" ) @@ -23,8 +27,58 @@ func NewSearchUsersLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Searc } } -func (l *SearchUsersLogic) SearchUsers(in *pb.SearchUsersReq) (*pb.SearchUsersResp, error) { - // todo: add your logic here and delete this line +var SearUsersErr = errors.New("search users failed") - return &pb.SearchUsersResp{}, nil +func (l *SearchUsersLogic) SearchUsers(in *pb.SearchUsersReq) (out *pb.SearchUsersResp, err error) { + user, err := l.svcCtx.UsersModelRO.Query(). + Where(users.Or( + users.UsernameContainsFold(*in.Username), + users.NicknameContainsFold(*in.Username), + users.EmailContainsFold(*in.Username), + users.CurrentRole(*in.CurrentRole), + )). + All(l.ctx) + if err != nil { + logx.Errorf("search users failed, err:%v.", err) + return nil, SearUsersErr + } + out = &pb.SearchUsersResp{ + Users: ConvertEntUsersToProto(user), + } + + return +} + +func ConvertEntUserToProto(entUser *models.Users) *pb.Users { + if entUser == nil { + return nil + } + out := &pb.Users{} + err := copier.Copy(out, entUser) + if err != nil { + return out + } + out.CreatedAt = entUser.CreatedAt.Unix() + out.UpdatedAt = entUser.UpdatedAt.Unix() + if !entUser.DeletedAt.IsZero() { + out.DeletedAt = entUser.DeletedAt.Unix() + } + + verificationStatus, err := json.Marshal(entUser.VerificationStatus) + if err != nil { + return nil + } + + out.VerificationStatus = string(verificationStatus) + out.VerifiedRoles = entUser.VerifiedRoles + + out.PasswordHash = "" // 手动清空敏感字段 + return out +} +func ConvertEntUsersToProto(users []*models.Users) []*pb.Users { + list := make([]*pb.Users, 0, len(users)) + for _, u := range users { + list = append(list, ConvertEntUserToProto(u)) + } + return list } diff --git a/app/users/rpc/internal/logic/updateUsersLogic.go b/app/users/rpc/internal/logic/updateUsersLogic.go index 9ace9aa..31a5883 100644 --- a/app/users/rpc/internal/logic/updateUsersLogic.go +++ b/app/users/rpc/internal/logic/updateUsersLogic.go @@ -2,7 +2,6 @@ package logic import ( "context" - "juwan-backend/app/users/rpc/internal/svc" "juwan-backend/app/users/rpc/pb" @@ -24,7 +23,18 @@ func NewUpdateUsersLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Updat } func (l *UpdateUsersLogic) UpdateUsers(in *pb.UpdateUsersReq) (*pb.UpdateUsersResp, error) { - // todo: add your logic here and delete this line - + updater := l.svcCtx.UsersModelRW.UpdateOneID(in.Id). + SetNillableNickname(in.Nickname). + SetNillableAvatar(in.Avatar). + SetNillableBio(in.Bio). + SetNillableCurrentRole(in.CurrentRole). + SetNillablePasswordHash(in.PasswordHash) + if len(in.VerifiedRoles) > 0 { + updater.SetVerifiedRoles(in.VerifiedRoles) + } + err := updater.Exec(l.ctx) + if err != nil { + return nil, err + } return &pb.UpdateUsersResp{}, nil } diff --git a/app/users/rpc/internal/logic/validateTokenLogic.go b/app/users/rpc/internal/logic/validateTokenLogic.go index 68408b7..3921fa0 100644 --- a/app/users/rpc/internal/logic/validateTokenLogic.go +++ b/app/users/rpc/internal/logic/validateTokenLogic.go @@ -2,6 +2,7 @@ package logic import ( "context" + "juwan-backend/app/users/rpc/internal/models/users" "juwan-backend/app/users/rpc/internal/svc" "juwan-backend/app/users/rpc/pb" @@ -31,7 +32,8 @@ func (l *ValidateTokenLogic) ValidateToken(in *pb.ValidateTokenReq) (*pb.Validat if err != nil { return nil, err } - users, err := l.svcCtx.UsersModelRO.FindOne(l.ctx, in.UserId) + //users, err := l.svcCtx.UsersModelRO.FindOne(l.ctx, in.UserId) + user, err := l.svcCtx.UsersModelRO.Query().Where(users.IDEQ(in.UserId)).First(l.ctx) if err != nil { return nil, err } @@ -40,6 +42,6 @@ func (l *ValidateTokenLogic) ValidateToken(in *pb.ValidateTokenReq) (*pb.Validat Valid: true, Message: "OK", UserId: in.UserId, - RoleType: users.RoleType, + RoleType: user.CurrentRole, }, nil } diff --git a/app/users/rpc/internal/models/client.go b/app/users/rpc/internal/models/client.go new file mode 100644 index 0000000..4321483 --- /dev/null +++ b/app/users/rpc/internal/models/client.go @@ -0,0 +1,341 @@ +// Code generated by ent, DO NOT EDIT. + +package models + +import ( + "context" + "errors" + "fmt" + "log" + "reflect" + + "juwan-backend/app/users/rpc/internal/models/migrate" + + "juwan-backend/app/users/rpc/internal/models/users" + + "entgo.io/ent" + "entgo.io/ent/dialect" + "entgo.io/ent/dialect/sql" +) + +// Client is the client that holds all ent builders. +type Client struct { + config + // Schema is the client for creating, migrating and dropping schema. + Schema *migrate.Schema + // Users is the client for interacting with the Users builders. + Users *UsersClient +} + +// NewClient creates a new client configured with the given options. +func NewClient(opts ...Option) *Client { + client := &Client{config: newConfig(opts...)} + client.init() + return client +} + +func (c *Client) init() { + c.Schema = migrate.NewSchema(c.driver) + c.Users = NewUsersClient(c.config) +} + +type ( + // config is the configuration for the client and its builder. + config struct { + // driver used for executing database requests. + driver dialect.Driver + // debug enable a debug logging. + debug bool + // log used for logging on debug mode. + log func(...any) + // hooks to execute on mutations. + hooks *hooks + // interceptors to execute on queries. + inters *inters + } + // Option function to configure the client. + Option func(*config) +) + +// newConfig creates a new config for the client. +func newConfig(opts ...Option) config { + cfg := config{log: log.Println, hooks: &hooks{}, inters: &inters{}} + cfg.options(opts...) + return cfg +} + +// options applies the options on the config object. +func (c *config) options(opts ...Option) { + for _, opt := range opts { + opt(c) + } + if c.debug { + c.driver = dialect.Debug(c.driver, c.log) + } +} + +// Debug enables debug logging on the ent.Driver. +func Debug() Option { + return func(c *config) { + c.debug = true + } +} + +// Log sets the logging function for debug mode. +func Log(fn func(...any)) Option { + return func(c *config) { + c.log = fn + } +} + +// Driver configures the client driver. +func Driver(driver dialect.Driver) Option { + return func(c *config) { + c.driver = driver + } +} + +// Open opens a database/sql.DB specified by the driver name and +// the data source name, and returns a new client attached to it. +// Optional parameters can be added for configuring the client. +func Open(driverName, dataSourceName string, options ...Option) (*Client, error) { + switch driverName { + case dialect.MySQL, dialect.Postgres, dialect.SQLite: + drv, err := sql.Open(driverName, dataSourceName) + if err != nil { + return nil, err + } + return NewClient(append(options, Driver(drv))...), nil + default: + return nil, fmt.Errorf("unsupported driver: %q", driverName) + } +} + +// ErrTxStarted is returned when trying to start a new transaction from a transactional client. +var ErrTxStarted = errors.New("models: cannot start a transaction within a transaction") + +// Tx returns a new transactional client. The provided context +// is used until the transaction is committed or rolled back. +func (c *Client) Tx(ctx context.Context) (*Tx, error) { + if _, ok := c.driver.(*txDriver); ok { + return nil, ErrTxStarted + } + tx, err := newTx(ctx, c.driver) + if err != nil { + return nil, fmt.Errorf("models: starting a transaction: %w", err) + } + cfg := c.config + cfg.driver = tx + return &Tx{ + ctx: ctx, + config: cfg, + Users: NewUsersClient(cfg), + }, nil +} + +// BeginTx returns a transactional client with specified options. +func (c *Client) BeginTx(ctx context.Context, opts *sql.TxOptions) (*Tx, error) { + if _, ok := c.driver.(*txDriver); ok { + return nil, errors.New("ent: cannot start a transaction within a transaction") + } + tx, err := c.driver.(interface { + BeginTx(context.Context, *sql.TxOptions) (dialect.Tx, error) + }).BeginTx(ctx, opts) + if err != nil { + return nil, fmt.Errorf("ent: starting a transaction: %w", err) + } + cfg := c.config + cfg.driver = &txDriver{tx: tx, drv: c.driver} + return &Tx{ + ctx: ctx, + config: cfg, + Users: NewUsersClient(cfg), + }, nil +} + +// Debug returns a new debug-client. It's used to get verbose logging on specific operations. +// +// client.Debug(). +// Users. +// Query(). +// Count(ctx) +func (c *Client) Debug() *Client { + if c.debug { + return c + } + cfg := c.config + cfg.driver = dialect.Debug(c.driver, c.log) + client := &Client{config: cfg} + client.init() + return client +} + +// Close closes the database connection and prevents new queries from starting. +func (c *Client) Close() error { + return c.driver.Close() +} + +// Use adds the mutation hooks to all the entity clients. +// In order to add hooks to a specific client, call: `client.Node.Use(...)`. +func (c *Client) Use(hooks ...Hook) { + c.Users.Use(hooks...) +} + +// Intercept adds the query interceptors to all the entity clients. +// In order to add interceptors to a specific client, call: `client.Node.Intercept(...)`. +func (c *Client) Intercept(interceptors ...Interceptor) { + c.Users.Intercept(interceptors...) +} + +// Mutate implements the ent.Mutator interface. +func (c *Client) Mutate(ctx context.Context, m Mutation) (Value, error) { + switch m := m.(type) { + case *UsersMutation: + return c.Users.mutate(ctx, m) + default: + return nil, fmt.Errorf("models: unknown mutation type %T", m) + } +} + +// UsersClient is a client for the Users schema. +type UsersClient struct { + config +} + +// NewUsersClient returns a client for the Users from the given config. +func NewUsersClient(c config) *UsersClient { + return &UsersClient{config: c} +} + +// Use adds a list of mutation hooks to the hooks stack. +// A call to `Use(f, g, h)` equals to `users.Hooks(f(g(h())))`. +func (c *UsersClient) Use(hooks ...Hook) { + c.hooks.Users = append(c.hooks.Users, hooks...) +} + +// Intercept adds a list of query interceptors to the interceptors stack. +// A call to `Intercept(f, g, h)` equals to `users.Intercept(f(g(h())))`. +func (c *UsersClient) Intercept(interceptors ...Interceptor) { + c.inters.Users = append(c.inters.Users, interceptors...) +} + +// Create returns a builder for creating a Users entity. +func (c *UsersClient) Create() *UsersCreate { + mutation := newUsersMutation(c.config, OpCreate) + return &UsersCreate{config: c.config, hooks: c.Hooks(), mutation: mutation} +} + +// CreateBulk returns a builder for creating a bulk of Users entities. +func (c *UsersClient) CreateBulk(builders ...*UsersCreate) *UsersCreateBulk { + return &UsersCreateBulk{config: c.config, builders: builders} +} + +// MapCreateBulk creates a bulk creation builder from the given slice. For each item in the slice, the function creates +// a builder and applies setFunc on it. +func (c *UsersClient) MapCreateBulk(slice any, setFunc func(*UsersCreate, int)) *UsersCreateBulk { + rv := reflect.ValueOf(slice) + if rv.Kind() != reflect.Slice { + return &UsersCreateBulk{err: fmt.Errorf("calling to UsersClient.MapCreateBulk with wrong type %T, need slice", slice)} + } + builders := make([]*UsersCreate, rv.Len()) + for i := 0; i < rv.Len(); i++ { + builders[i] = c.Create() + setFunc(builders[i], i) + } + return &UsersCreateBulk{config: c.config, builders: builders} +} + +// Update returns an update builder for Users. +func (c *UsersClient) Update() *UsersUpdate { + mutation := newUsersMutation(c.config, OpUpdate) + return &UsersUpdate{config: c.config, hooks: c.Hooks(), mutation: mutation} +} + +// UpdateOne returns an update builder for the given entity. +func (c *UsersClient) UpdateOne(_m *Users) *UsersUpdateOne { + mutation := newUsersMutation(c.config, OpUpdateOne, withUsers(_m)) + return &UsersUpdateOne{config: c.config, hooks: c.Hooks(), mutation: mutation} +} + +// UpdateOneID returns an update builder for the given id. +func (c *UsersClient) UpdateOneID(id int64) *UsersUpdateOne { + mutation := newUsersMutation(c.config, OpUpdateOne, withUsersID(id)) + return &UsersUpdateOne{config: c.config, hooks: c.Hooks(), mutation: mutation} +} + +// Delete returns a delete builder for Users. +func (c *UsersClient) Delete() *UsersDelete { + mutation := newUsersMutation(c.config, OpDelete) + return &UsersDelete{config: c.config, hooks: c.Hooks(), mutation: mutation} +} + +// DeleteOne returns a builder for deleting the given entity. +func (c *UsersClient) DeleteOne(_m *Users) *UsersDeleteOne { + return c.DeleteOneID(_m.ID) +} + +// DeleteOneID returns a builder for deleting the given entity by its id. +func (c *UsersClient) DeleteOneID(id int64) *UsersDeleteOne { + builder := c.Delete().Where(users.ID(id)) + builder.mutation.id = &id + builder.mutation.op = OpDeleteOne + return &UsersDeleteOne{builder} +} + +// Query returns a query builder for Users. +func (c *UsersClient) Query() *UsersQuery { + return &UsersQuery{ + config: c.config, + ctx: &QueryContext{Type: TypeUsers}, + inters: c.Interceptors(), + } +} + +// Get returns a Users entity by its id. +func (c *UsersClient) Get(ctx context.Context, id int64) (*Users, error) { + return c.Query().Where(users.ID(id)).Only(ctx) +} + +// GetX is like Get, but panics if an error occurs. +func (c *UsersClient) GetX(ctx context.Context, id int64) *Users { + obj, err := c.Get(ctx, id) + if err != nil { + panic(err) + } + return obj +} + +// Hooks returns the client hooks. +func (c *UsersClient) Hooks() []Hook { + return c.hooks.Users +} + +// Interceptors returns the client interceptors. +func (c *UsersClient) Interceptors() []Interceptor { + return c.inters.Users +} + +func (c *UsersClient) mutate(ctx context.Context, m *UsersMutation) (Value, error) { + switch m.Op() { + case OpCreate: + return (&UsersCreate{config: c.config, hooks: c.Hooks(), mutation: m}).Save(ctx) + case OpUpdate: + return (&UsersUpdate{config: c.config, hooks: c.Hooks(), mutation: m}).Save(ctx) + case OpUpdateOne: + return (&UsersUpdateOne{config: c.config, hooks: c.Hooks(), mutation: m}).Save(ctx) + case OpDelete, OpDeleteOne: + return (&UsersDelete{config: c.config, hooks: c.Hooks(), mutation: m}).Exec(ctx) + default: + return nil, fmt.Errorf("models: unknown Users mutation op: %q", m.Op()) + } +} + +// hooks and interceptors per client, for fast access. +type ( + hooks struct { + Users []ent.Hook + } + inters struct { + Users []ent.Interceptor + } +) diff --git a/app/users/rpc/internal/models/ent.go b/app/users/rpc/internal/models/ent.go new file mode 100644 index 0000000..19a95a8 --- /dev/null +++ b/app/users/rpc/internal/models/ent.go @@ -0,0 +1,608 @@ +// Code generated by ent, DO NOT EDIT. + +package models + +import ( + "context" + "errors" + "fmt" + "juwan-backend/app/users/rpc/internal/models/users" + "reflect" + "sync" + + "entgo.io/ent" + "entgo.io/ent/dialect/sql" + "entgo.io/ent/dialect/sql/sqlgraph" +) + +// ent aliases to avoid import conflicts in user's code. +type ( + Op = ent.Op + Hook = ent.Hook + Value = ent.Value + Query = ent.Query + QueryContext = ent.QueryContext + Querier = ent.Querier + QuerierFunc = ent.QuerierFunc + Interceptor = ent.Interceptor + InterceptFunc = ent.InterceptFunc + Traverser = ent.Traverser + TraverseFunc = ent.TraverseFunc + Policy = ent.Policy + Mutator = ent.Mutator + Mutation = ent.Mutation + MutateFunc = ent.MutateFunc +) + +type clientCtxKey struct{} + +// FromContext returns a Client stored inside a context, or nil if there isn't one. +func FromContext(ctx context.Context) *Client { + c, _ := ctx.Value(clientCtxKey{}).(*Client) + return c +} + +// NewContext returns a new context with the given Client attached. +func NewContext(parent context.Context, c *Client) context.Context { + return context.WithValue(parent, clientCtxKey{}, c) +} + +type txCtxKey struct{} + +// TxFromContext returns a Tx stored inside a context, or nil if there isn't one. +func TxFromContext(ctx context.Context) *Tx { + tx, _ := ctx.Value(txCtxKey{}).(*Tx) + return tx +} + +// NewTxContext returns a new context with the given Tx attached. +func NewTxContext(parent context.Context, tx *Tx) context.Context { + return context.WithValue(parent, txCtxKey{}, tx) +} + +// OrderFunc applies an ordering on the sql selector. +// Deprecated: Use Asc/Desc functions or the package builders instead. +type OrderFunc func(*sql.Selector) + +var ( + initCheck sync.Once + columnCheck sql.ColumnCheck +) + +// checkColumn checks if the column exists in the given table. +func checkColumn(t, c string) error { + initCheck.Do(func() { + columnCheck = sql.NewColumnCheck(map[string]func(string) bool{ + users.Table: users.ValidColumn, + }) + }) + return columnCheck(t, c) +} + +// Asc applies the given fields in ASC order. +func Asc(fields ...string) func(*sql.Selector) { + return func(s *sql.Selector) { + for _, f := range fields { + if err := checkColumn(s.TableName(), f); err != nil { + s.AddError(&ValidationError{Name: f, err: fmt.Errorf("models: %w", err)}) + } + s.OrderBy(sql.Asc(s.C(f))) + } + } +} + +// Desc applies the given fields in DESC order. +func Desc(fields ...string) func(*sql.Selector) { + return func(s *sql.Selector) { + for _, f := range fields { + if err := checkColumn(s.TableName(), f); err != nil { + s.AddError(&ValidationError{Name: f, err: fmt.Errorf("models: %w", err)}) + } + s.OrderBy(sql.Desc(s.C(f))) + } + } +} + +// AggregateFunc applies an aggregation step on the group-by traversal/selector. +type AggregateFunc func(*sql.Selector) string + +// As is a pseudo aggregation function for renaming another other functions with custom names. For example: +// +// GroupBy(field1, field2). +// Aggregate(models.As(models.Sum(field1), "sum_field1"), (models.As(models.Sum(field2), "sum_field2")). +// Scan(ctx, &v) +func As(fn AggregateFunc, end string) AggregateFunc { + return func(s *sql.Selector) string { + return sql.As(fn(s), end) + } +} + +// Count applies the "count" aggregation function on each group. +func Count() AggregateFunc { + return func(s *sql.Selector) string { + return sql.Count("*") + } +} + +// Max applies the "max" aggregation function on the given field of each group. +func Max(field string) AggregateFunc { + return func(s *sql.Selector) string { + if err := checkColumn(s.TableName(), field); err != nil { + s.AddError(&ValidationError{Name: field, err: fmt.Errorf("models: %w", err)}) + return "" + } + return sql.Max(s.C(field)) + } +} + +// Mean applies the "mean" aggregation function on the given field of each group. +func Mean(field string) AggregateFunc { + return func(s *sql.Selector) string { + if err := checkColumn(s.TableName(), field); err != nil { + s.AddError(&ValidationError{Name: field, err: fmt.Errorf("models: %w", err)}) + return "" + } + return sql.Avg(s.C(field)) + } +} + +// Min applies the "min" aggregation function on the given field of each group. +func Min(field string) AggregateFunc { + return func(s *sql.Selector) string { + if err := checkColumn(s.TableName(), field); err != nil { + s.AddError(&ValidationError{Name: field, err: fmt.Errorf("models: %w", err)}) + return "" + } + return sql.Min(s.C(field)) + } +} + +// Sum applies the "sum" aggregation function on the given field of each group. +func Sum(field string) AggregateFunc { + return func(s *sql.Selector) string { + if err := checkColumn(s.TableName(), field); err != nil { + s.AddError(&ValidationError{Name: field, err: fmt.Errorf("models: %w", err)}) + return "" + } + return sql.Sum(s.C(field)) + } +} + +// ValidationError returns when validating a field or edge fails. +type ValidationError struct { + Name string // Field or edge name. + err error +} + +// Error implements the error interface. +func (e *ValidationError) Error() string { + return e.err.Error() +} + +// Unwrap implements the errors.Wrapper interface. +func (e *ValidationError) Unwrap() error { + return e.err +} + +// IsValidationError returns a boolean indicating whether the error is a validation error. +func IsValidationError(err error) bool { + if err == nil { + return false + } + var e *ValidationError + return errors.As(err, &e) +} + +// NotFoundError returns when trying to fetch a specific entity and it was not found in the database. +type NotFoundError struct { + label string +} + +// Error implements the error interface. +func (e *NotFoundError) Error() string { + return "models: " + e.label + " not found" +} + +// IsNotFound returns a boolean indicating whether the error is a not found error. +func IsNotFound(err error) bool { + if err == nil { + return false + } + var e *NotFoundError + return errors.As(err, &e) +} + +// MaskNotFound masks not found error. +func MaskNotFound(err error) error { + if IsNotFound(err) { + return nil + } + return err +} + +// NotSingularError returns when trying to fetch a singular entity and more then one was found in the database. +type NotSingularError struct { + label string +} + +// Error implements the error interface. +func (e *NotSingularError) Error() string { + return "models: " + e.label + " not singular" +} + +// IsNotSingular returns a boolean indicating whether the error is a not singular error. +func IsNotSingular(err error) bool { + if err == nil { + return false + } + var e *NotSingularError + return errors.As(err, &e) +} + +// NotLoadedError returns when trying to get a node that was not loaded by the query. +type NotLoadedError struct { + edge string +} + +// Error implements the error interface. +func (e *NotLoadedError) Error() string { + return "models: " + e.edge + " edge was not loaded" +} + +// IsNotLoaded returns a boolean indicating whether the error is a not loaded error. +func IsNotLoaded(err error) bool { + if err == nil { + return false + } + var e *NotLoadedError + return errors.As(err, &e) +} + +// ConstraintError returns when trying to create/update one or more entities and +// one or more of their constraints failed. For example, violation of edge or +// field uniqueness. +type ConstraintError struct { + msg string + wrap error +} + +// Error implements the error interface. +func (e ConstraintError) Error() string { + return "models: constraint failed: " + e.msg +} + +// Unwrap implements the errors.Wrapper interface. +func (e *ConstraintError) Unwrap() error { + return e.wrap +} + +// IsConstraintError returns a boolean indicating whether the error is a constraint failure. +func IsConstraintError(err error) bool { + if err == nil { + return false + } + var e *ConstraintError + return errors.As(err, &e) +} + +// selector embedded by the different Select/GroupBy builders. +type selector struct { + label string + flds *[]string + fns []AggregateFunc + scan func(context.Context, any) error +} + +// ScanX is like Scan, but panics if an error occurs. +func (s *selector) ScanX(ctx context.Context, v any) { + if err := s.scan(ctx, v); err != nil { + panic(err) + } +} + +// Strings returns list of strings from a selector. It is only allowed when selecting one field. +func (s *selector) Strings(ctx context.Context) ([]string, error) { + if len(*s.flds) > 1 { + return nil, errors.New("models: Strings is not achievable when selecting more than 1 field") + } + var v []string + if err := s.scan(ctx, &v); err != nil { + return nil, err + } + return v, nil +} + +// StringsX is like Strings, but panics if an error occurs. +func (s *selector) StringsX(ctx context.Context) []string { + v, err := s.Strings(ctx) + if err != nil { + panic(err) + } + return v +} + +// String returns a single string from a selector. It is only allowed when selecting one field. +func (s *selector) String(ctx context.Context) (_ string, err error) { + var v []string + if v, err = s.Strings(ctx); err != nil { + return + } + switch len(v) { + case 1: + return v[0], nil + case 0: + err = &NotFoundError{s.label} + default: + err = fmt.Errorf("models: Strings returned %d results when one was expected", len(v)) + } + return +} + +// StringX is like String, but panics if an error occurs. +func (s *selector) StringX(ctx context.Context) string { + v, err := s.String(ctx) + if err != nil { + panic(err) + } + return v +} + +// Ints returns list of ints from a selector. It is only allowed when selecting one field. +func (s *selector) Ints(ctx context.Context) ([]int, error) { + if len(*s.flds) > 1 { + return nil, errors.New("models: Ints is not achievable when selecting more than 1 field") + } + var v []int + if err := s.scan(ctx, &v); err != nil { + return nil, err + } + return v, nil +} + +// IntsX is like Ints, but panics if an error occurs. +func (s *selector) IntsX(ctx context.Context) []int { + v, err := s.Ints(ctx) + if err != nil { + panic(err) + } + return v +} + +// Int returns a single int from a selector. It is only allowed when selecting one field. +func (s *selector) Int(ctx context.Context) (_ int, err error) { + var v []int + if v, err = s.Ints(ctx); err != nil { + return + } + switch len(v) { + case 1: + return v[0], nil + case 0: + err = &NotFoundError{s.label} + default: + err = fmt.Errorf("models: Ints returned %d results when one was expected", len(v)) + } + return +} + +// IntX is like Int, but panics if an error occurs. +func (s *selector) IntX(ctx context.Context) int { + v, err := s.Int(ctx) + if err != nil { + panic(err) + } + return v +} + +// Float64s returns list of float64s from a selector. It is only allowed when selecting one field. +func (s *selector) Float64s(ctx context.Context) ([]float64, error) { + if len(*s.flds) > 1 { + return nil, errors.New("models: Float64s is not achievable when selecting more than 1 field") + } + var v []float64 + if err := s.scan(ctx, &v); err != nil { + return nil, err + } + return v, nil +} + +// Float64sX is like Float64s, but panics if an error occurs. +func (s *selector) Float64sX(ctx context.Context) []float64 { + v, err := s.Float64s(ctx) + if err != nil { + panic(err) + } + return v +} + +// Float64 returns a single float64 from a selector. It is only allowed when selecting one field. +func (s *selector) Float64(ctx context.Context) (_ float64, err error) { + var v []float64 + if v, err = s.Float64s(ctx); err != nil { + return + } + switch len(v) { + case 1: + return v[0], nil + case 0: + err = &NotFoundError{s.label} + default: + err = fmt.Errorf("models: Float64s returned %d results when one was expected", len(v)) + } + return +} + +// Float64X is like Float64, but panics if an error occurs. +func (s *selector) Float64X(ctx context.Context) float64 { + v, err := s.Float64(ctx) + if err != nil { + panic(err) + } + return v +} + +// Bools returns list of bools from a selector. It is only allowed when selecting one field. +func (s *selector) Bools(ctx context.Context) ([]bool, error) { + if len(*s.flds) > 1 { + return nil, errors.New("models: Bools is not achievable when selecting more than 1 field") + } + var v []bool + if err := s.scan(ctx, &v); err != nil { + return nil, err + } + return v, nil +} + +// BoolsX is like Bools, but panics if an error occurs. +func (s *selector) BoolsX(ctx context.Context) []bool { + v, err := s.Bools(ctx) + if err != nil { + panic(err) + } + return v +} + +// Bool returns a single bool from a selector. It is only allowed when selecting one field. +func (s *selector) Bool(ctx context.Context) (_ bool, err error) { + var v []bool + if v, err = s.Bools(ctx); err != nil { + return + } + switch len(v) { + case 1: + return v[0], nil + case 0: + err = &NotFoundError{s.label} + default: + err = fmt.Errorf("models: Bools returned %d results when one was expected", len(v)) + } + return +} + +// BoolX is like Bool, but panics if an error occurs. +func (s *selector) BoolX(ctx context.Context) bool { + v, err := s.Bool(ctx) + if err != nil { + panic(err) + } + return v +} + +// withHooks invokes the builder operation with the given hooks, if any. +func withHooks[V Value, M any, PM interface { + *M + Mutation +}](ctx context.Context, exec func(context.Context) (V, error), mutation PM, hooks []Hook) (value V, err error) { + if len(hooks) == 0 { + return exec(ctx) + } + var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) { + mutationT, ok := any(m).(PM) + if !ok { + return nil, fmt.Errorf("unexpected mutation type %T", m) + } + // Set the mutation to the builder. + *mutation = *mutationT + return exec(ctx) + }) + for i := len(hooks) - 1; i >= 0; i-- { + if hooks[i] == nil { + return value, fmt.Errorf("ent: uninitialized hook (forgotten import ent/runtime?)") + } + mut = hooks[i](mut) + } + v, err := mut.Mutate(ctx, mutation) + if err != nil { + return value, err + } + nv, ok := v.(V) + if !ok { + return value, fmt.Errorf("unexpected node type %T returned from %T", v, mutation) + } + return nv, nil +} + +// setContextOp returns a new context with the given QueryContext attached (including its op) in case it does not exist. +func setContextOp(ctx context.Context, qc *QueryContext, op string) context.Context { + if ent.QueryFromContext(ctx) == nil { + qc.Op = op + ctx = ent.NewQueryContext(ctx, qc) + } + return ctx +} + +func querierAll[V Value, Q interface { + sqlAll(context.Context, ...queryHook) (V, error) +}]() Querier { + return QuerierFunc(func(ctx context.Context, q Query) (Value, error) { + query, ok := q.(Q) + if !ok { + return nil, fmt.Errorf("unexpected query type %T", q) + } + return query.sqlAll(ctx) + }) +} + +func querierCount[Q interface { + sqlCount(context.Context) (int, error) +}]() Querier { + return QuerierFunc(func(ctx context.Context, q Query) (Value, error) { + query, ok := q.(Q) + if !ok { + return nil, fmt.Errorf("unexpected query type %T", q) + } + return query.sqlCount(ctx) + }) +} + +func withInterceptors[V Value](ctx context.Context, q Query, qr Querier, inters []Interceptor) (v V, err error) { + for i := len(inters) - 1; i >= 0; i-- { + qr = inters[i].Intercept(qr) + } + rv, err := qr.Query(ctx, q) + if err != nil { + return v, err + } + vt, ok := rv.(V) + if !ok { + return v, fmt.Errorf("unexpected type %T returned from %T. expected type: %T", vt, q, v) + } + return vt, nil +} + +func scanWithInterceptors[Q1 ent.Query, Q2 interface { + sqlScan(context.Context, Q1, any) error +}](ctx context.Context, rootQuery Q1, selectOrGroup Q2, inters []Interceptor, v any) error { + rv := reflect.ValueOf(v) + var qr Querier = QuerierFunc(func(ctx context.Context, q Query) (Value, error) { + query, ok := q.(Q1) + if !ok { + return nil, fmt.Errorf("unexpected query type %T", q) + } + if err := selectOrGroup.sqlScan(ctx, query, v); err != nil { + return nil, err + } + if k := rv.Kind(); k == reflect.Pointer && rv.Elem().CanInterface() { + return rv.Elem().Interface(), nil + } + return v, nil + }) + for i := len(inters) - 1; i >= 0; i-- { + qr = inters[i].Intercept(qr) + } + vv, err := qr.Query(ctx, rootQuery) + if err != nil { + return err + } + switch rv2 := reflect.ValueOf(vv); { + case rv.IsNil(), rv2.IsNil(), rv.Kind() != reflect.Pointer: + case rv.Type() == rv2.Type(): + rv.Elem().Set(rv2.Elem()) + case rv.Elem().Type() == rv2.Type(): + rv.Elem().Set(rv2) + } + return nil +} + +// queryHook describes an internal hook for the different sqlAll methods. +type queryHook func(context.Context, *sqlgraph.QuerySpec) diff --git a/app/users/rpc/internal/models/enttest/enttest.go b/app/users/rpc/internal/models/enttest/enttest.go new file mode 100644 index 0000000..9897c98 --- /dev/null +++ b/app/users/rpc/internal/models/enttest/enttest.go @@ -0,0 +1,85 @@ +// Code generated by ent, DO NOT EDIT. + +package enttest + +import ( + "context" + + "juwan-backend/app/users/rpc/internal/models" + // required by schema hooks. + _ "juwan-backend/app/users/rpc/internal/models/runtime" + + "juwan-backend/app/users/rpc/internal/models/migrate" + + "entgo.io/ent/dialect/sql/schema" +) + +type ( + // TestingT is the interface that is shared between + // testing.T and testing.B and used by enttest. + TestingT interface { + FailNow() + Error(...any) + } + + // Option configures client creation. + Option func(*options) + + options struct { + opts []models.Option + migrateOpts []schema.MigrateOption + } +) + +// WithOptions forwards options to client creation. +func WithOptions(opts ...models.Option) Option { + return func(o *options) { + o.opts = append(o.opts, opts...) + } +} + +// WithMigrateOptions forwards options to auto migration. +func WithMigrateOptions(opts ...schema.MigrateOption) Option { + return func(o *options) { + o.migrateOpts = append(o.migrateOpts, opts...) + } +} + +func newOptions(opts []Option) *options { + o := &options{} + for _, opt := range opts { + opt(o) + } + return o +} + +// Open calls models.Open and auto-run migration. +func Open(t TestingT, driverName, dataSourceName string, opts ...Option) *models.Client { + o := newOptions(opts) + c, err := models.Open(driverName, dataSourceName, o.opts...) + if err != nil { + t.Error(err) + t.FailNow() + } + migrateSchema(t, c, o) + return c +} + +// NewClient calls models.NewClient and auto-run migration. +func NewClient(t TestingT, opts ...Option) *models.Client { + o := newOptions(opts) + c := models.NewClient(o.opts...) + migrateSchema(t, c, o) + return c +} +func migrateSchema(t TestingT, c *models.Client, o *options) { + tables, err := schema.CopyTables(migrate.Tables) + if err != nil { + t.Error(err) + t.FailNow() + } + if err := migrate.Create(context.Background(), c.Schema, tables, o.migrateOpts...); err != nil { + t.Error(err) + t.FailNow() + } +} diff --git a/app/users/rpc/internal/models/generate.go b/app/users/rpc/internal/models/generate.go new file mode 100644 index 0000000..d441aca --- /dev/null +++ b/app/users/rpc/internal/models/generate.go @@ -0,0 +1,3 @@ +package models + +//go:generate go run -mod=mod entgo.io/ent/cmd/ent generate ./schema diff --git a/app/users/rpc/internal/models/hook/hook.go b/app/users/rpc/internal/models/hook/hook.go new file mode 100644 index 0000000..3a5d32f --- /dev/null +++ b/app/users/rpc/internal/models/hook/hook.go @@ -0,0 +1,198 @@ +// Code generated by ent, DO NOT EDIT. + +package hook + +import ( + "context" + "fmt" + "juwan-backend/app/users/rpc/internal/models" +) + +// The UsersFunc type is an adapter to allow the use of ordinary +// function as Users mutator. +type UsersFunc func(context.Context, *models.UsersMutation) (models.Value, error) + +// Mutate calls f(ctx, m). +func (f UsersFunc) Mutate(ctx context.Context, m models.Mutation) (models.Value, error) { + if mv, ok := m.(*models.UsersMutation); ok { + return f(ctx, mv) + } + return nil, fmt.Errorf("unexpected mutation type %T. expect *models.UsersMutation", m) +} + +// Condition is a hook condition function. +type Condition func(context.Context, models.Mutation) bool + +// And groups conditions with the AND operator. +func And(first, second Condition, rest ...Condition) Condition { + return func(ctx context.Context, m models.Mutation) bool { + if !first(ctx, m) || !second(ctx, m) { + return false + } + for _, cond := range rest { + if !cond(ctx, m) { + return false + } + } + return true + } +} + +// Or groups conditions with the OR operator. +func Or(first, second Condition, rest ...Condition) Condition { + return func(ctx context.Context, m models.Mutation) bool { + if first(ctx, m) || second(ctx, m) { + return true + } + for _, cond := range rest { + if cond(ctx, m) { + return true + } + } + return false + } +} + +// Not negates a given condition. +func Not(cond Condition) Condition { + return func(ctx context.Context, m models.Mutation) bool { + return !cond(ctx, m) + } +} + +// HasOp is a condition testing mutation operation. +func HasOp(op models.Op) Condition { + return func(_ context.Context, m models.Mutation) bool { + return m.Op().Is(op) + } +} + +// HasAddedFields is a condition validating `.AddedField` on fields. +func HasAddedFields(field string, fields ...string) Condition { + return func(_ context.Context, m models.Mutation) bool { + if _, exists := m.AddedField(field); !exists { + return false + } + for _, field := range fields { + if _, exists := m.AddedField(field); !exists { + return false + } + } + return true + } +} + +// HasClearedFields is a condition validating `.FieldCleared` on fields. +func HasClearedFields(field string, fields ...string) Condition { + return func(_ context.Context, m models.Mutation) bool { + if exists := m.FieldCleared(field); !exists { + return false + } + for _, field := range fields { + if exists := m.FieldCleared(field); !exists { + return false + } + } + return true + } +} + +// HasFields is a condition validating `.Field` on fields. +func HasFields(field string, fields ...string) Condition { + return func(_ context.Context, m models.Mutation) bool { + if _, exists := m.Field(field); !exists { + return false + } + for _, field := range fields { + if _, exists := m.Field(field); !exists { + return false + } + } + return true + } +} + +// If executes the given hook under condition. +// +// hook.If(ComputeAverage, And(HasFields(...), HasAddedFields(...))) +func If(hk models.Hook, cond Condition) models.Hook { + return func(next models.Mutator) models.Mutator { + return models.MutateFunc(func(ctx context.Context, m models.Mutation) (models.Value, error) { + if cond(ctx, m) { + return hk(next).Mutate(ctx, m) + } + return next.Mutate(ctx, m) + }) + } +} + +// On executes the given hook only for the given operation. +// +// hook.On(Log, models.Delete|models.Create) +func On(hk models.Hook, op models.Op) models.Hook { + return If(hk, HasOp(op)) +} + +// Unless skips the given hook only for the given operation. +// +// hook.Unless(Log, models.Update|models.UpdateOne) +func Unless(hk models.Hook, op models.Op) models.Hook { + return If(hk, Not(HasOp(op))) +} + +// FixedError is a hook returning a fixed error. +func FixedError(err error) models.Hook { + return func(models.Mutator) models.Mutator { + return models.MutateFunc(func(context.Context, models.Mutation) (models.Value, error) { + return nil, err + }) + } +} + +// Reject returns a hook that rejects all operations that match op. +// +// func (T) Hooks() []models.Hook { +// return []models.Hook{ +// Reject(models.Delete|models.Update), +// } +// } +func Reject(op models.Op) models.Hook { + hk := FixedError(fmt.Errorf("%s operation is not allowed", op)) + return On(hk, op) +} + +// Chain acts as a list of hooks and is effectively immutable. +// Once created, it will always hold the same set of hooks in the same order. +type Chain struct { + hooks []models.Hook +} + +// NewChain creates a new chain of hooks. +func NewChain(hooks ...models.Hook) Chain { + return Chain{append([]models.Hook(nil), hooks...)} +} + +// Hook chains the list of hooks and returns the final hook. +func (c Chain) Hook() models.Hook { + return func(mutator models.Mutator) models.Mutator { + for i := len(c.hooks) - 1; i >= 0; i-- { + mutator = c.hooks[i](mutator) + } + return mutator + } +} + +// Append extends a chain, adding the specified hook +// as the last ones in the mutation flow. +func (c Chain) Append(hooks ...models.Hook) Chain { + newHooks := make([]models.Hook, 0, len(c.hooks)+len(hooks)) + newHooks = append(newHooks, c.hooks...) + newHooks = append(newHooks, hooks...) + return Chain{newHooks} +} + +// Extend extends a chain, adding the specified chain +// as the last ones in the mutation flow. +func (c Chain) Extend(chain Chain) Chain { + return c.Append(chain.hooks...) +} diff --git a/app/users/rpc/internal/models/migrate/migrate.go b/app/users/rpc/internal/models/migrate/migrate.go new file mode 100644 index 0000000..1956a6b --- /dev/null +++ b/app/users/rpc/internal/models/migrate/migrate.go @@ -0,0 +1,64 @@ +// Code generated by ent, DO NOT EDIT. + +package migrate + +import ( + "context" + "fmt" + "io" + + "entgo.io/ent/dialect" + "entgo.io/ent/dialect/sql/schema" +) + +var ( + // WithGlobalUniqueID sets the universal ids options to the migration. + // If this option is enabled, ent migration will allocate a 1<<32 range + // for the ids of each entity (table). + // Note that this option cannot be applied on tables that already exist. + WithGlobalUniqueID = schema.WithGlobalUniqueID + // WithDropColumn sets the drop column option to the migration. + // If this option is enabled, ent migration will drop old columns + // that were used for both fields and edges. This defaults to false. + WithDropColumn = schema.WithDropColumn + // WithDropIndex sets the drop index option to the migration. + // If this option is enabled, ent migration will drop old indexes + // that were defined in the schema. This defaults to false. + // Note that unique constraints are defined using `UNIQUE INDEX`, + // and therefore, it's recommended to enable this option to get more + // flexibility in the schema changes. + WithDropIndex = schema.WithDropIndex + // WithForeignKeys enables creating foreign-key in schema DDL. This defaults to true. + WithForeignKeys = schema.WithForeignKeys +) + +// Schema is the API for creating, migrating and dropping a schema. +type Schema struct { + drv dialect.Driver +} + +// NewSchema creates a new schema client. +func NewSchema(drv dialect.Driver) *Schema { return &Schema{drv: drv} } + +// Create creates all schema resources. +func (s *Schema) Create(ctx context.Context, opts ...schema.MigrateOption) error { + return Create(ctx, s, Tables, opts...) +} + +// Create creates all table resources using the given schema driver. +func Create(ctx context.Context, s *Schema, tables []*schema.Table, opts ...schema.MigrateOption) error { + migrate, err := schema.NewMigrate(s.drv, opts...) + if err != nil { + return fmt.Errorf("ent/migrate: %w", err) + } + return migrate.Create(ctx, tables...) +} + +// WriteTo writes the schema changes to w instead of running them against the database. +// +// if err := client.Schema.WriteTo(context.Background(), os.Stdout); err != nil { +// log.Fatal(err) +// } +func (s *Schema) WriteTo(ctx context.Context, w io.Writer, opts ...schema.MigrateOption) error { + return Create(ctx, &Schema{drv: &schema.WriteDriver{Writer: w, Driver: s.drv}}, Tables, opts...) +} diff --git a/app/users/rpc/internal/models/migrate/schema.go b/app/users/rpc/internal/models/migrate/schema.go new file mode 100644 index 0000000..1916473 --- /dev/null +++ b/app/users/rpc/internal/models/migrate/schema.go @@ -0,0 +1,42 @@ +// Code generated by ent, DO NOT EDIT. + +package migrate + +import ( + "entgo.io/ent/dialect/sql/schema" + "entgo.io/ent/schema/field" +) + +var ( + // UsersColumns holds the columns for the "users" table. + UsersColumns = []*schema.Column{ + {Name: "id", Type: field.TypeInt64, Increment: true}, + {Name: "username", Type: field.TypeString, Unique: true}, + {Name: "password_hash", Type: field.TypeString}, + {Name: "email", Type: field.TypeString, Unique: true}, + {Name: "phone", Type: field.TypeString, Unique: true}, + {Name: "nickname", Type: field.TypeString}, + {Name: "avatar", Type: field.TypeString}, + {Name: "bio", Type: field.TypeString}, + {Name: "current_role", Type: field.TypeString}, + {Name: "verified_roles", Type: field.TypeJSON}, + {Name: "verification_status", Type: field.TypeJSON}, + {Name: "is_admin", Type: field.TypeBool, Default: false}, + {Name: "created_at", Type: field.TypeTime}, + {Name: "updated_at", Type: field.TypeTime}, + {Name: "deleted_at", Type: field.TypeTime}, + } + // UsersTable holds the schema information for the "users" table. + UsersTable = &schema.Table{ + Name: "users", + Columns: UsersColumns, + PrimaryKey: []*schema.Column{UsersColumns[0]}, + } + // Tables holds all the tables in the schema. + Tables = []*schema.Table{ + UsersTable, + } +) + +func init() { +} diff --git a/app/users/rpc/internal/models/mutation.go b/app/users/rpc/internal/models/mutation.go new file mode 100644 index 0000000..ff1a7fc --- /dev/null +++ b/app/users/rpc/internal/models/mutation.go @@ -0,0 +1,1079 @@ +// Code generated by ent, DO NOT EDIT. + +package models + +import ( + "context" + "errors" + "fmt" + "juwan-backend/app/users/rpc/internal/models/predicate" + "juwan-backend/app/users/rpc/internal/models/schema" + "juwan-backend/app/users/rpc/internal/models/users" + "sync" + "time" + + "entgo.io/ent" + "entgo.io/ent/dialect/sql" +) + +const ( + // Operation types. + OpCreate = ent.OpCreate + OpDelete = ent.OpDelete + OpDeleteOne = ent.OpDeleteOne + OpUpdate = ent.OpUpdate + OpUpdateOne = ent.OpUpdateOne + + // Node types. + TypeUsers = "Users" +) + +// UsersMutation represents an operation that mutates the Users nodes in the graph. +type UsersMutation struct { + config + op Op + typ string + id *int64 + username *string + password_hash *string + email *string + phone *string + nickname *string + avatar *string + bio *string + current_role *string + verified_roles *[]string + appendverified_roles []string + verificationStatus *schema.VerificationStatusStruct + is_admin *bool + created_at *time.Time + updated_at *time.Time + deleted_at *time.Time + clearedFields map[string]struct{} + done bool + oldValue func(context.Context) (*Users, error) + predicates []predicate.Users +} + +var _ ent.Mutation = (*UsersMutation)(nil) + +// usersOption allows management of the mutation configuration using functional options. +type usersOption func(*UsersMutation) + +// newUsersMutation creates new mutation for the Users entity. +func newUsersMutation(c config, op Op, opts ...usersOption) *UsersMutation { + m := &UsersMutation{ + config: c, + op: op, + typ: TypeUsers, + clearedFields: make(map[string]struct{}), + } + for _, opt := range opts { + opt(m) + } + return m +} + +// withUsersID sets the ID field of the mutation. +func withUsersID(id int64) usersOption { + return func(m *UsersMutation) { + var ( + err error + once sync.Once + value *Users + ) + m.oldValue = func(ctx context.Context) (*Users, error) { + once.Do(func() { + if m.done { + err = errors.New("querying old values post mutation is not allowed") + } else { + value, err = m.Client().Users.Get(ctx, id) + } + }) + return value, err + } + m.id = &id + } +} + +// withUsers sets the old Users of the mutation. +func withUsers(node *Users) usersOption { + return func(m *UsersMutation) { + m.oldValue = func(context.Context) (*Users, error) { + return node, nil + } + m.id = &node.ID + } +} + +// Client returns a new `ent.Client` from the mutation. If the mutation was +// executed in a transaction (ent.Tx), a transactional client is returned. +func (m UsersMutation) Client() *Client { + client := &Client{config: m.config} + client.init() + return client +} + +// Tx returns an `ent.Tx` for mutations that were executed in transactions; +// it returns an error otherwise. +func (m UsersMutation) Tx() (*Tx, error) { + if _, ok := m.driver.(*txDriver); !ok { + return nil, errors.New("models: mutation is not running in a transaction") + } + tx := &Tx{config: m.config} + tx.init() + return tx, nil +} + +// SetID sets the value of the id field. Note that this +// operation is only accepted on creation of Users entities. +func (m *UsersMutation) SetID(id int64) { + m.id = &id +} + +// ID returns the ID value in the mutation. Note that the ID is only available +// if it was provided to the builder or after it was returned from the database. +func (m *UsersMutation) ID() (id int64, exists bool) { + if m.id == nil { + return + } + return *m.id, true +} + +// IDs queries the database and returns the entity ids that match the mutation's predicate. +// That means, if the mutation is applied within a transaction with an isolation level such +// as sql.LevelSerializable, the returned ids match the ids of the rows that will be updated +// or updated by the mutation. +func (m *UsersMutation) IDs(ctx context.Context) ([]int64, error) { + switch { + case m.op.Is(OpUpdateOne | OpDeleteOne): + id, exists := m.ID() + if exists { + return []int64{id}, nil + } + fallthrough + case m.op.Is(OpUpdate | OpDelete): + return m.Client().Users.Query().Where(m.predicates...).IDs(ctx) + default: + return nil, fmt.Errorf("IDs is not allowed on %s operations", m.op) + } +} + +// SetUsername sets the "username" field. +func (m *UsersMutation) SetUsername(s string) { + m.username = &s +} + +// Username returns the value of the "username" field in the mutation. +func (m *UsersMutation) Username() (r string, exists bool) { + v := m.username + if v == nil { + return + } + return *v, true +} + +// OldUsername returns the old "username" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldUsername(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldUsername is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldUsername requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldUsername: %w", err) + } + return oldValue.Username, nil +} + +// ResetUsername resets all changes to the "username" field. +func (m *UsersMutation) ResetUsername() { + m.username = nil +} + +// SetPasswordHash sets the "password_hash" field. +func (m *UsersMutation) SetPasswordHash(s string) { + m.password_hash = &s +} + +// PasswordHash returns the value of the "password_hash" field in the mutation. +func (m *UsersMutation) PasswordHash() (r string, exists bool) { + v := m.password_hash + if v == nil { + return + } + return *v, true +} + +// OldPasswordHash returns the old "password_hash" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldPasswordHash(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldPasswordHash is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldPasswordHash requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldPasswordHash: %w", err) + } + return oldValue.PasswordHash, nil +} + +// ResetPasswordHash resets all changes to the "password_hash" field. +func (m *UsersMutation) ResetPasswordHash() { + m.password_hash = nil +} + +// SetEmail sets the "email" field. +func (m *UsersMutation) SetEmail(s string) { + m.email = &s +} + +// Email returns the value of the "email" field in the mutation. +func (m *UsersMutation) Email() (r string, exists bool) { + v := m.email + if v == nil { + return + } + return *v, true +} + +// OldEmail returns the old "email" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldEmail(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldEmail is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldEmail requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldEmail: %w", err) + } + return oldValue.Email, nil +} + +// ResetEmail resets all changes to the "email" field. +func (m *UsersMutation) ResetEmail() { + m.email = nil +} + +// SetPhone sets the "phone" field. +func (m *UsersMutation) SetPhone(s string) { + m.phone = &s +} + +// Phone returns the value of the "phone" field in the mutation. +func (m *UsersMutation) Phone() (r string, exists bool) { + v := m.phone + if v == nil { + return + } + return *v, true +} + +// OldPhone returns the old "phone" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldPhone(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldPhone is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldPhone requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldPhone: %w", err) + } + return oldValue.Phone, nil +} + +// ResetPhone resets all changes to the "phone" field. +func (m *UsersMutation) ResetPhone() { + m.phone = nil +} + +// SetNickname sets the "nickname" field. +func (m *UsersMutation) SetNickname(s string) { + m.nickname = &s +} + +// Nickname returns the value of the "nickname" field in the mutation. +func (m *UsersMutation) Nickname() (r string, exists bool) { + v := m.nickname + if v == nil { + return + } + return *v, true +} + +// OldNickname returns the old "nickname" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldNickname(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldNickname is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldNickname requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldNickname: %w", err) + } + return oldValue.Nickname, nil +} + +// ResetNickname resets all changes to the "nickname" field. +func (m *UsersMutation) ResetNickname() { + m.nickname = nil +} + +// SetAvatar sets the "avatar" field. +func (m *UsersMutation) SetAvatar(s string) { + m.avatar = &s +} + +// Avatar returns the value of the "avatar" field in the mutation. +func (m *UsersMutation) Avatar() (r string, exists bool) { + v := m.avatar + if v == nil { + return + } + return *v, true +} + +// OldAvatar returns the old "avatar" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldAvatar(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldAvatar is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldAvatar requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldAvatar: %w", err) + } + return oldValue.Avatar, nil +} + +// ResetAvatar resets all changes to the "avatar" field. +func (m *UsersMutation) ResetAvatar() { + m.avatar = nil +} + +// SetBio sets the "bio" field. +func (m *UsersMutation) SetBio(s string) { + m.bio = &s +} + +// Bio returns the value of the "bio" field in the mutation. +func (m *UsersMutation) Bio() (r string, exists bool) { + v := m.bio + if v == nil { + return + } + return *v, true +} + +// OldBio returns the old "bio" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldBio(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldBio is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldBio requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldBio: %w", err) + } + return oldValue.Bio, nil +} + +// ResetBio resets all changes to the "bio" field. +func (m *UsersMutation) ResetBio() { + m.bio = nil +} + +// SetCurrentRole sets the "current_role" field. +func (m *UsersMutation) SetCurrentRole(s string) { + m.current_role = &s +} + +// CurrentRole returns the value of the "current_role" field in the mutation. +func (m *UsersMutation) CurrentRole() (r string, exists bool) { + v := m.current_role + if v == nil { + return + } + return *v, true +} + +// OldCurrentRole returns the old "current_role" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldCurrentRole(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldCurrentRole is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldCurrentRole requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldCurrentRole: %w", err) + } + return oldValue.CurrentRole, nil +} + +// ResetCurrentRole resets all changes to the "current_role" field. +func (m *UsersMutation) ResetCurrentRole() { + m.current_role = nil +} + +// SetVerifiedRoles sets the "verified_roles" field. +func (m *UsersMutation) SetVerifiedRoles(s []string) { + m.verified_roles = &s + m.appendverified_roles = nil +} + +// VerifiedRoles returns the value of the "verified_roles" field in the mutation. +func (m *UsersMutation) VerifiedRoles() (r []string, exists bool) { + v := m.verified_roles + if v == nil { + return + } + return *v, true +} + +// OldVerifiedRoles returns the old "verified_roles" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldVerifiedRoles(ctx context.Context) (v []string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldVerifiedRoles is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldVerifiedRoles requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldVerifiedRoles: %w", err) + } + return oldValue.VerifiedRoles, nil +} + +// AppendVerifiedRoles adds s to the "verified_roles" field. +func (m *UsersMutation) AppendVerifiedRoles(s []string) { + m.appendverified_roles = append(m.appendverified_roles, s...) +} + +// AppendedVerifiedRoles returns the list of values that were appended to the "verified_roles" field in this mutation. +func (m *UsersMutation) AppendedVerifiedRoles() ([]string, bool) { + if len(m.appendverified_roles) == 0 { + return nil, false + } + return m.appendverified_roles, true +} + +// ResetVerifiedRoles resets all changes to the "verified_roles" field. +func (m *UsersMutation) ResetVerifiedRoles() { + m.verified_roles = nil + m.appendverified_roles = nil +} + +// SetVerificationStatus sets the "verificationStatus" field. +func (m *UsersMutation) SetVerificationStatus(sss schema.VerificationStatusStruct) { + m.verificationStatus = &sss +} + +// VerificationStatus returns the value of the "verificationStatus" field in the mutation. +func (m *UsersMutation) VerificationStatus() (r schema.VerificationStatusStruct, exists bool) { + v := m.verificationStatus + if v == nil { + return + } + return *v, true +} + +// OldVerificationStatus returns the old "verificationStatus" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldVerificationStatus(ctx context.Context) (v schema.VerificationStatusStruct, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldVerificationStatus is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldVerificationStatus requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldVerificationStatus: %w", err) + } + return oldValue.VerificationStatus, nil +} + +// ResetVerificationStatus resets all changes to the "verificationStatus" field. +func (m *UsersMutation) ResetVerificationStatus() { + m.verificationStatus = nil +} + +// SetIsAdmin sets the "is_admin" field. +func (m *UsersMutation) SetIsAdmin(b bool) { + m.is_admin = &b +} + +// IsAdmin returns the value of the "is_admin" field in the mutation. +func (m *UsersMutation) IsAdmin() (r bool, exists bool) { + v := m.is_admin + if v == nil { + return + } + return *v, true +} + +// OldIsAdmin returns the old "is_admin" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldIsAdmin(ctx context.Context) (v bool, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldIsAdmin is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldIsAdmin requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldIsAdmin: %w", err) + } + return oldValue.IsAdmin, nil +} + +// ResetIsAdmin resets all changes to the "is_admin" field. +func (m *UsersMutation) ResetIsAdmin() { + m.is_admin = nil +} + +// SetCreatedAt sets the "created_at" field. +func (m *UsersMutation) SetCreatedAt(t time.Time) { + m.created_at = &t +} + +// CreatedAt returns the value of the "created_at" field in the mutation. +func (m *UsersMutation) CreatedAt() (r time.Time, exists bool) { + v := m.created_at + if v == nil { + return + } + return *v, true +} + +// OldCreatedAt returns the old "created_at" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldCreatedAt(ctx context.Context) (v time.Time, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldCreatedAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldCreatedAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldCreatedAt: %w", err) + } + return oldValue.CreatedAt, nil +} + +// ResetCreatedAt resets all changes to the "created_at" field. +func (m *UsersMutation) ResetCreatedAt() { + m.created_at = nil +} + +// SetUpdatedAt sets the "updated_at" field. +func (m *UsersMutation) SetUpdatedAt(t time.Time) { + m.updated_at = &t +} + +// UpdatedAt returns the value of the "updated_at" field in the mutation. +func (m *UsersMutation) UpdatedAt() (r time.Time, exists bool) { + v := m.updated_at + if v == nil { + return + } + return *v, true +} + +// OldUpdatedAt returns the old "updated_at" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldUpdatedAt(ctx context.Context) (v time.Time, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldUpdatedAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldUpdatedAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldUpdatedAt: %w", err) + } + return oldValue.UpdatedAt, nil +} + +// ResetUpdatedAt resets all changes to the "updated_at" field. +func (m *UsersMutation) ResetUpdatedAt() { + m.updated_at = nil +} + +// SetDeletedAt sets the "deleted_at" field. +func (m *UsersMutation) SetDeletedAt(t time.Time) { + m.deleted_at = &t +} + +// DeletedAt returns the value of the "deleted_at" field in the mutation. +func (m *UsersMutation) DeletedAt() (r time.Time, exists bool) { + v := m.deleted_at + if v == nil { + return + } + return *v, true +} + +// OldDeletedAt returns the old "deleted_at" field's value of the Users entity. +// If the Users object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *UsersMutation) OldDeletedAt(ctx context.Context) (v time.Time, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldDeletedAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldDeletedAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldDeletedAt: %w", err) + } + return oldValue.DeletedAt, nil +} + +// ResetDeletedAt resets all changes to the "deleted_at" field. +func (m *UsersMutation) ResetDeletedAt() { + m.deleted_at = nil +} + +// Where appends a list predicates to the UsersMutation builder. +func (m *UsersMutation) Where(ps ...predicate.Users) { + m.predicates = append(m.predicates, ps...) +} + +// WhereP appends storage-level predicates to the UsersMutation builder. Using this method, +// users can use type-assertion to append predicates that do not depend on any generated package. +func (m *UsersMutation) WhereP(ps ...func(*sql.Selector)) { + p := make([]predicate.Users, len(ps)) + for i := range ps { + p[i] = ps[i] + } + m.Where(p...) +} + +// Op returns the operation name. +func (m *UsersMutation) Op() Op { + return m.op +} + +// SetOp allows setting the mutation operation. +func (m *UsersMutation) SetOp(op Op) { + m.op = op +} + +// Type returns the node type of this mutation (Users). +func (m *UsersMutation) Type() string { + return m.typ +} + +// Fields returns all fields that were changed during this mutation. Note that in +// order to get all numeric fields that were incremented/decremented, call +// AddedFields(). +func (m *UsersMutation) Fields() []string { + fields := make([]string, 0, 14) + if m.username != nil { + fields = append(fields, users.FieldUsername) + } + if m.password_hash != nil { + fields = append(fields, users.FieldPasswordHash) + } + if m.email != nil { + fields = append(fields, users.FieldEmail) + } + if m.phone != nil { + fields = append(fields, users.FieldPhone) + } + if m.nickname != nil { + fields = append(fields, users.FieldNickname) + } + if m.avatar != nil { + fields = append(fields, users.FieldAvatar) + } + if m.bio != nil { + fields = append(fields, users.FieldBio) + } + if m.current_role != nil { + fields = append(fields, users.FieldCurrentRole) + } + if m.verified_roles != nil { + fields = append(fields, users.FieldVerifiedRoles) + } + if m.verificationStatus != nil { + fields = append(fields, users.FieldVerificationStatus) + } + if m.is_admin != nil { + fields = append(fields, users.FieldIsAdmin) + } + if m.created_at != nil { + fields = append(fields, users.FieldCreatedAt) + } + if m.updated_at != nil { + fields = append(fields, users.FieldUpdatedAt) + } + if m.deleted_at != nil { + fields = append(fields, users.FieldDeletedAt) + } + return fields +} + +// Field returns the value of a field with the given name. The second boolean +// return value indicates that this field was not set, or was not defined in the +// schema. +func (m *UsersMutation) Field(name string) (ent.Value, bool) { + switch name { + case users.FieldUsername: + return m.Username() + case users.FieldPasswordHash: + return m.PasswordHash() + case users.FieldEmail: + return m.Email() + case users.FieldPhone: + return m.Phone() + case users.FieldNickname: + return m.Nickname() + case users.FieldAvatar: + return m.Avatar() + case users.FieldBio: + return m.Bio() + case users.FieldCurrentRole: + return m.CurrentRole() + case users.FieldVerifiedRoles: + return m.VerifiedRoles() + case users.FieldVerificationStatus: + return m.VerificationStatus() + case users.FieldIsAdmin: + return m.IsAdmin() + case users.FieldCreatedAt: + return m.CreatedAt() + case users.FieldUpdatedAt: + return m.UpdatedAt() + case users.FieldDeletedAt: + return m.DeletedAt() + } + return nil, false +} + +// OldField returns the old value of the field from the database. An error is +// returned if the mutation operation is not UpdateOne, or the query to the +// database failed. +func (m *UsersMutation) OldField(ctx context.Context, name string) (ent.Value, error) { + switch name { + case users.FieldUsername: + return m.OldUsername(ctx) + case users.FieldPasswordHash: + return m.OldPasswordHash(ctx) + case users.FieldEmail: + return m.OldEmail(ctx) + case users.FieldPhone: + return m.OldPhone(ctx) + case users.FieldNickname: + return m.OldNickname(ctx) + case users.FieldAvatar: + return m.OldAvatar(ctx) + case users.FieldBio: + return m.OldBio(ctx) + case users.FieldCurrentRole: + return m.OldCurrentRole(ctx) + case users.FieldVerifiedRoles: + return m.OldVerifiedRoles(ctx) + case users.FieldVerificationStatus: + return m.OldVerificationStatus(ctx) + case users.FieldIsAdmin: + return m.OldIsAdmin(ctx) + case users.FieldCreatedAt: + return m.OldCreatedAt(ctx) + case users.FieldUpdatedAt: + return m.OldUpdatedAt(ctx) + case users.FieldDeletedAt: + return m.OldDeletedAt(ctx) + } + return nil, fmt.Errorf("unknown Users field %s", name) +} + +// SetField sets the value of a field with the given name. It returns an error if +// the field is not defined in the schema, or if the type mismatched the field +// type. +func (m *UsersMutation) SetField(name string, value ent.Value) error { + switch name { + case users.FieldUsername: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetUsername(v) + return nil + case users.FieldPasswordHash: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetPasswordHash(v) + return nil + case users.FieldEmail: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetEmail(v) + return nil + case users.FieldPhone: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetPhone(v) + return nil + case users.FieldNickname: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetNickname(v) + return nil + case users.FieldAvatar: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetAvatar(v) + return nil + case users.FieldBio: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetBio(v) + return nil + case users.FieldCurrentRole: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetCurrentRole(v) + return nil + case users.FieldVerifiedRoles: + v, ok := value.([]string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetVerifiedRoles(v) + return nil + case users.FieldVerificationStatus: + v, ok := value.(schema.VerificationStatusStruct) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetVerificationStatus(v) + return nil + case users.FieldIsAdmin: + v, ok := value.(bool) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetIsAdmin(v) + return nil + case users.FieldCreatedAt: + v, ok := value.(time.Time) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetCreatedAt(v) + return nil + case users.FieldUpdatedAt: + v, ok := value.(time.Time) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetUpdatedAt(v) + return nil + case users.FieldDeletedAt: + v, ok := value.(time.Time) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetDeletedAt(v) + return nil + } + return fmt.Errorf("unknown Users field %s", name) +} + +// AddedFields returns all numeric fields that were incremented/decremented during +// this mutation. +func (m *UsersMutation) AddedFields() []string { + return nil +} + +// AddedField returns the numeric value that was incremented/decremented on a field +// with the given name. The second boolean return value indicates that this field +// was not set, or was not defined in the schema. +func (m *UsersMutation) AddedField(name string) (ent.Value, bool) { + return nil, false +} + +// AddField adds the value to the field with the given name. It returns an error if +// the field is not defined in the schema, or if the type mismatched the field +// type. +func (m *UsersMutation) AddField(name string, value ent.Value) error { + switch name { + } + return fmt.Errorf("unknown Users numeric field %s", name) +} + +// ClearedFields returns all nullable fields that were cleared during this +// mutation. +func (m *UsersMutation) ClearedFields() []string { + return nil +} + +// FieldCleared returns a boolean indicating if a field with the given name was +// cleared in this mutation. +func (m *UsersMutation) FieldCleared(name string) bool { + _, ok := m.clearedFields[name] + return ok +} + +// ClearField clears the value of the field with the given name. It returns an +// error if the field is not defined in the schema. +func (m *UsersMutation) ClearField(name string) error { + return fmt.Errorf("unknown Users nullable field %s", name) +} + +// ResetField resets all changes in the mutation for the field with the given name. +// It returns an error if the field is not defined in the schema. +func (m *UsersMutation) ResetField(name string) error { + switch name { + case users.FieldUsername: + m.ResetUsername() + return nil + case users.FieldPasswordHash: + m.ResetPasswordHash() + return nil + case users.FieldEmail: + m.ResetEmail() + return nil + case users.FieldPhone: + m.ResetPhone() + return nil + case users.FieldNickname: + m.ResetNickname() + return nil + case users.FieldAvatar: + m.ResetAvatar() + return nil + case users.FieldBio: + m.ResetBio() + return nil + case users.FieldCurrentRole: + m.ResetCurrentRole() + return nil + case users.FieldVerifiedRoles: + m.ResetVerifiedRoles() + return nil + case users.FieldVerificationStatus: + m.ResetVerificationStatus() + return nil + case users.FieldIsAdmin: + m.ResetIsAdmin() + return nil + case users.FieldCreatedAt: + m.ResetCreatedAt() + return nil + case users.FieldUpdatedAt: + m.ResetUpdatedAt() + return nil + case users.FieldDeletedAt: + m.ResetDeletedAt() + return nil + } + return fmt.Errorf("unknown Users field %s", name) +} + +// AddedEdges returns all edge names that were set/added in this mutation. +func (m *UsersMutation) AddedEdges() []string { + edges := make([]string, 0, 0) + return edges +} + +// AddedIDs returns all IDs (to other nodes) that were added for the given edge +// name in this mutation. +func (m *UsersMutation) AddedIDs(name string) []ent.Value { + return nil +} + +// RemovedEdges returns all edge names that were removed in this mutation. +func (m *UsersMutation) RemovedEdges() []string { + edges := make([]string, 0, 0) + return edges +} + +// RemovedIDs returns all IDs (to other nodes) that were removed for the edge with +// the given name in this mutation. +func (m *UsersMutation) RemovedIDs(name string) []ent.Value { + return nil +} + +// ClearedEdges returns all edge names that were cleared in this mutation. +func (m *UsersMutation) ClearedEdges() []string { + edges := make([]string, 0, 0) + return edges +} + +// EdgeCleared returns a boolean which indicates if the edge with the given name +// was cleared in this mutation. +func (m *UsersMutation) EdgeCleared(name string) bool { + return false +} + +// ClearEdge clears the value of the edge with the given name. It returns an error +// if that edge is not defined in the schema. +func (m *UsersMutation) ClearEdge(name string) error { + return fmt.Errorf("unknown Users unique edge %s", name) +} + +// ResetEdge resets all changes to the edge with the given name in this mutation. +// It returns an error if the edge is not defined in the schema. +func (m *UsersMutation) ResetEdge(name string) error { + return fmt.Errorf("unknown Users edge %s", name) +} diff --git a/app/users/rpc/internal/models/predicate/predicate.go b/app/users/rpc/internal/models/predicate/predicate.go new file mode 100644 index 0000000..7da0420 --- /dev/null +++ b/app/users/rpc/internal/models/predicate/predicate.go @@ -0,0 +1,10 @@ +// Code generated by ent, DO NOT EDIT. + +package predicate + +import ( + "entgo.io/ent/dialect/sql" +) + +// Users is the predicate function for users builders. +type Users func(*sql.Selector) diff --git a/app/users/rpc/internal/models/runtime.go b/app/users/rpc/internal/models/runtime.go new file mode 100644 index 0000000..83eda3c --- /dev/null +++ b/app/users/rpc/internal/models/runtime.go @@ -0,0 +1,29 @@ +// Code generated by ent, DO NOT EDIT. + +package models + +import ( + "juwan-backend/app/users/rpc/internal/models/schema" + "juwan-backend/app/users/rpc/internal/models/users" + "time" +) + +// The init function reads all schema descriptors with runtime code +// (default values, validators, hooks and policies) and stitches it +// to their package variables. +func init() { + usersFields := schema.Users{}.Fields() + _ = usersFields + // usersDescIsAdmin is the schema descriptor for is_admin field. + usersDescIsAdmin := usersFields[11].Descriptor() + // users.DefaultIsAdmin holds the default value on creation for the is_admin field. + users.DefaultIsAdmin = usersDescIsAdmin.Default.(bool) + // usersDescCreatedAt is the schema descriptor for created_at field. + usersDescCreatedAt := usersFields[12].Descriptor() + // users.DefaultCreatedAt holds the default value on creation for the created_at field. + users.DefaultCreatedAt = usersDescCreatedAt.Default.(func() time.Time) + // usersDescUpdatedAt is the schema descriptor for updated_at field. + usersDescUpdatedAt := usersFields[13].Descriptor() + // users.DefaultUpdatedAt holds the default value on creation for the updated_at field. + users.DefaultUpdatedAt = usersDescUpdatedAt.Default.(func() time.Time) +} diff --git a/app/users/rpc/internal/models/runtime/runtime.go b/app/users/rpc/internal/models/runtime/runtime.go new file mode 100644 index 0000000..9186108 --- /dev/null +++ b/app/users/rpc/internal/models/runtime/runtime.go @@ -0,0 +1,10 @@ +// Code generated by ent, DO NOT EDIT. + +package runtime + +// The schema-stitching logic is generated in juwan-backend/app/users/rpc/internal/models/runtime.go + +const ( + Version = "v0.14.5" // Version of ent codegen. + Sum = "h1:Rj2WOYJtCkWyFo6a+5wB3EfBRP0rnx1fMk6gGA0UUe4=" // Sum of ent codegen. +) diff --git a/app/users/rpc/internal/models/schema/users.go b/app/users/rpc/internal/models/schema/users.go new file mode 100644 index 0000000..7a5e3b0 --- /dev/null +++ b/app/users/rpc/internal/models/schema/users.go @@ -0,0 +1,45 @@ +package schema + +import ( + "time" + + "entgo.io/ent" + "entgo.io/ent/schema/field" +) + +// Users holds the schema definition for the Users entity. +type Users struct { + ent.Schema +} + +type VerificationStatusStruct struct { + Player string `json:"player" validate:"oneof:pending rejected approved"` + Owner string `json:"owner" validate:"oneof:pending rejected approved"` + Consumer string `json:"consumer" validate:"oneof:pending rejected approved"` +} + +// Fields of the Users. +func (Users) Fields() []ent.Field { + return []ent.Field{ + field.Int64("id").Unique().Immutable(), + field.String("username").Unique(), + field.String("password_hash"), + field.String("email").Unique(), + field.String("phone").Unique(), + field.String("nickname"), + field.String("avatar"), + field.String("bio"), + field.String("current_role"), + field.Strings("verified_roles"), + field.JSON("verificationStatus", VerificationStatusStruct{}), + field.Bool("is_admin").Default(false), + field.Time("created_at").Default(time.Now), + field.Time("updated_at").Default(time.Now), + field.Time("deleted_at"), + } +} + +// Edges of the Users. +func (Users) Edges() []ent.Edge { + return nil +} diff --git a/app/users/rpc/internal/models/tx.go b/app/users/rpc/internal/models/tx.go new file mode 100644 index 0000000..b10f159 --- /dev/null +++ b/app/users/rpc/internal/models/tx.go @@ -0,0 +1,210 @@ +// Code generated by ent, DO NOT EDIT. + +package models + +import ( + "context" + "sync" + + "entgo.io/ent/dialect" +) + +// Tx is a transactional client that is created by calling Client.Tx(). +type Tx struct { + config + // Users is the client for interacting with the Users builders. + Users *UsersClient + + // lazily loaded. + client *Client + clientOnce sync.Once + // ctx lives for the life of the transaction. It is + // the same context used by the underlying connection. + ctx context.Context +} + +type ( + // Committer is the interface that wraps the Commit method. + Committer interface { + Commit(context.Context, *Tx) error + } + + // The CommitFunc type is an adapter to allow the use of ordinary + // function as a Committer. If f is a function with the appropriate + // signature, CommitFunc(f) is a Committer that calls f. + CommitFunc func(context.Context, *Tx) error + + // CommitHook defines the "commit middleware". A function that gets a Committer + // and returns a Committer. For example: + // + // hook := func(next ent.Committer) ent.Committer { + // return ent.CommitFunc(func(ctx context.Context, tx *ent.Tx) error { + // // Do some stuff before. + // if err := next.Commit(ctx, tx); err != nil { + // return err + // } + // // Do some stuff after. + // return nil + // }) + // } + // + CommitHook func(Committer) Committer +) + +// Commit calls f(ctx, m). +func (f CommitFunc) Commit(ctx context.Context, tx *Tx) error { + return f(ctx, tx) +} + +// Commit commits the transaction. +func (tx *Tx) Commit() error { + txDriver := tx.config.driver.(*txDriver) + var fn Committer = CommitFunc(func(context.Context, *Tx) error { + return txDriver.tx.Commit() + }) + txDriver.mu.Lock() + hooks := append([]CommitHook(nil), txDriver.onCommit...) + txDriver.mu.Unlock() + for i := len(hooks) - 1; i >= 0; i-- { + fn = hooks[i](fn) + } + return fn.Commit(tx.ctx, tx) +} + +// OnCommit adds a hook to call on commit. +func (tx *Tx) OnCommit(f CommitHook) { + txDriver := tx.config.driver.(*txDriver) + txDriver.mu.Lock() + txDriver.onCommit = append(txDriver.onCommit, f) + txDriver.mu.Unlock() +} + +type ( + // Rollbacker is the interface that wraps the Rollback method. + Rollbacker interface { + Rollback(context.Context, *Tx) error + } + + // The RollbackFunc type is an adapter to allow the use of ordinary + // function as a Rollbacker. If f is a function with the appropriate + // signature, RollbackFunc(f) is a Rollbacker that calls f. + RollbackFunc func(context.Context, *Tx) error + + // RollbackHook defines the "rollback middleware". A function that gets a Rollbacker + // and returns a Rollbacker. For example: + // + // hook := func(next ent.Rollbacker) ent.Rollbacker { + // return ent.RollbackFunc(func(ctx context.Context, tx *ent.Tx) error { + // // Do some stuff before. + // if err := next.Rollback(ctx, tx); err != nil { + // return err + // } + // // Do some stuff after. + // return nil + // }) + // } + // + RollbackHook func(Rollbacker) Rollbacker +) + +// Rollback calls f(ctx, m). +func (f RollbackFunc) Rollback(ctx context.Context, tx *Tx) error { + return f(ctx, tx) +} + +// Rollback rollbacks the transaction. +func (tx *Tx) Rollback() error { + txDriver := tx.config.driver.(*txDriver) + var fn Rollbacker = RollbackFunc(func(context.Context, *Tx) error { + return txDriver.tx.Rollback() + }) + txDriver.mu.Lock() + hooks := append([]RollbackHook(nil), txDriver.onRollback...) + txDriver.mu.Unlock() + for i := len(hooks) - 1; i >= 0; i-- { + fn = hooks[i](fn) + } + return fn.Rollback(tx.ctx, tx) +} + +// OnRollback adds a hook to call on rollback. +func (tx *Tx) OnRollback(f RollbackHook) { + txDriver := tx.config.driver.(*txDriver) + txDriver.mu.Lock() + txDriver.onRollback = append(txDriver.onRollback, f) + txDriver.mu.Unlock() +} + +// Client returns a Client that binds to current transaction. +func (tx *Tx) Client() *Client { + tx.clientOnce.Do(func() { + tx.client = &Client{config: tx.config} + tx.client.init() + }) + return tx.client +} + +func (tx *Tx) init() { + tx.Users = NewUsersClient(tx.config) +} + +// txDriver wraps the given dialect.Tx with a nop dialect.Driver implementation. +// The idea is to support transactions without adding any extra code to the builders. +// When a builder calls to driver.Tx(), it gets the same dialect.Tx instance. +// Commit and Rollback are nop for the internal builders and the user must call one +// of them in order to commit or rollback the transaction. +// +// If a closed transaction is embedded in one of the generated entities, and the entity +// applies a query, for example: Users.QueryXXX(), the query will be executed +// through the driver which created this transaction. +// +// Note that txDriver is not goroutine safe. +type txDriver struct { + // the driver we started the transaction from. + drv dialect.Driver + // tx is the underlying transaction. + tx dialect.Tx + // completion hooks. + mu sync.Mutex + onCommit []CommitHook + onRollback []RollbackHook +} + +// newTx creates a new transactional driver. +func newTx(ctx context.Context, drv dialect.Driver) (*txDriver, error) { + tx, err := drv.Tx(ctx) + if err != nil { + return nil, err + } + return &txDriver{tx: tx, drv: drv}, nil +} + +// Tx returns the transaction wrapper (txDriver) to avoid Commit or Rollback calls +// from the internal builders. Should be called only by the internal builders. +func (tx *txDriver) Tx(context.Context) (dialect.Tx, error) { return tx, nil } + +// Dialect returns the dialect of the driver we started the transaction from. +func (tx *txDriver) Dialect() string { return tx.drv.Dialect() } + +// Close is a nop close. +func (*txDriver) Close() error { return nil } + +// Commit is a nop commit for the internal builders. +// User must call `Tx.Commit` in order to commit the transaction. +func (*txDriver) Commit() error { return nil } + +// Rollback is a nop rollback for the internal builders. +// User must call `Tx.Rollback` in order to rollback the transaction. +func (*txDriver) Rollback() error { return nil } + +// Exec calls tx.Exec. +func (tx *txDriver) Exec(ctx context.Context, query string, args, v any) error { + return tx.tx.Exec(ctx, query, args, v) +} + +// Query calls tx.Query. +func (tx *txDriver) Query(ctx context.Context, query string, args, v any) error { + return tx.tx.Query(ctx, query, args, v) +} + +var _ dialect.Driver = (*txDriver)(nil) diff --git a/app/users/rpc/internal/models/users.go b/app/users/rpc/internal/models/users.go new file mode 100644 index 0000000..3c01873 --- /dev/null +++ b/app/users/rpc/internal/models/users.go @@ -0,0 +1,259 @@ +// Code generated by ent, DO NOT EDIT. + +package models + +import ( + "encoding/json" + "fmt" + "juwan-backend/app/users/rpc/internal/models/schema" + "juwan-backend/app/users/rpc/internal/models/users" + "strings" + "time" + + "entgo.io/ent" + "entgo.io/ent/dialect/sql" +) + +// Users is the model entity for the Users schema. +type Users struct { + config `json:"-"` + // ID of the ent. + ID int64 `json:"id,omitempty"` + // Username holds the value of the "username" field. + Username string `json:"username,omitempty"` + // PasswordHash holds the value of the "password_hash" field. + PasswordHash string `json:"password_hash,omitempty"` + // Email holds the value of the "email" field. + Email string `json:"email,omitempty"` + // Phone holds the value of the "phone" field. + Phone string `json:"phone,omitempty"` + // Nickname holds the value of the "nickname" field. + Nickname string `json:"nickname,omitempty"` + // Avatar holds the value of the "avatar" field. + Avatar string `json:"avatar,omitempty"` + // Bio holds the value of the "bio" field. + Bio string `json:"bio,omitempty"` + // CurrentRole holds the value of the "current_role" field. + CurrentRole string `json:"current_role,omitempty"` + // VerifiedRoles holds the value of the "verified_roles" field. + VerifiedRoles []string `json:"verified_roles,omitempty"` + // VerificationStatus holds the value of the "verificationStatus" field. + VerificationStatus schema.VerificationStatusStruct `json:"verificationStatus,omitempty"` + // IsAdmin holds the value of the "is_admin" field. + IsAdmin bool `json:"is_admin,omitempty"` + // CreatedAt holds the value of the "created_at" field. + CreatedAt time.Time `json:"created_at,omitempty"` + // UpdatedAt holds the value of the "updated_at" field. + UpdatedAt time.Time `json:"updated_at,omitempty"` + // DeletedAt holds the value of the "deleted_at" field. + DeletedAt time.Time `json:"deleted_at,omitempty"` + selectValues sql.SelectValues +} + +// scanValues returns the types for scanning values from sql.Rows. +func (*Users) scanValues(columns []string) ([]any, error) { + values := make([]any, len(columns)) + for i := range columns { + switch columns[i] { + case users.FieldVerifiedRoles, users.FieldVerificationStatus: + values[i] = new([]byte) + case users.FieldIsAdmin: + values[i] = new(sql.NullBool) + case users.FieldID: + values[i] = new(sql.NullInt64) + case users.FieldUsername, users.FieldPasswordHash, users.FieldEmail, users.FieldPhone, users.FieldNickname, users.FieldAvatar, users.FieldBio, users.FieldCurrentRole: + values[i] = new(sql.NullString) + case users.FieldCreatedAt, users.FieldUpdatedAt, users.FieldDeletedAt: + values[i] = new(sql.NullTime) + default: + values[i] = new(sql.UnknownType) + } + } + return values, nil +} + +// assignValues assigns the values that were returned from sql.Rows (after scanning) +// to the Users fields. +func (_m *Users) assignValues(columns []string, values []any) error { + if m, n := len(values), len(columns); m < n { + return fmt.Errorf("mismatch number of scan values: %d != %d", m, n) + } + for i := range columns { + switch columns[i] { + case users.FieldID: + value, ok := values[i].(*sql.NullInt64) + if !ok { + return fmt.Errorf("unexpected type %T for field id", value) + } + _m.ID = int64(value.Int64) + case users.FieldUsername: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field username", values[i]) + } else if value.Valid { + _m.Username = value.String + } + case users.FieldPasswordHash: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field password_hash", values[i]) + } else if value.Valid { + _m.PasswordHash = value.String + } + case users.FieldEmail: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field email", values[i]) + } else if value.Valid { + _m.Email = value.String + } + case users.FieldPhone: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field phone", values[i]) + } else if value.Valid { + _m.Phone = value.String + } + case users.FieldNickname: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field nickname", values[i]) + } else if value.Valid { + _m.Nickname = value.String + } + case users.FieldAvatar: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field avatar", values[i]) + } else if value.Valid { + _m.Avatar = value.String + } + case users.FieldBio: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field bio", values[i]) + } else if value.Valid { + _m.Bio = value.String + } + case users.FieldCurrentRole: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field current_role", values[i]) + } else if value.Valid { + _m.CurrentRole = value.String + } + case users.FieldVerifiedRoles: + if value, ok := values[i].(*[]byte); !ok { + return fmt.Errorf("unexpected type %T for field verified_roles", values[i]) + } else if value != nil && len(*value) > 0 { + if err := json.Unmarshal(*value, &_m.VerifiedRoles); err != nil { + return fmt.Errorf("unmarshal field verified_roles: %w", err) + } + } + case users.FieldVerificationStatus: + if value, ok := values[i].(*[]byte); !ok { + return fmt.Errorf("unexpected type %T for field verificationStatus", values[i]) + } else if value != nil && len(*value) > 0 { + if err := json.Unmarshal(*value, &_m.VerificationStatus); err != nil { + return fmt.Errorf("unmarshal field verificationStatus: %w", err) + } + } + case users.FieldIsAdmin: + if value, ok := values[i].(*sql.NullBool); !ok { + return fmt.Errorf("unexpected type %T for field is_admin", values[i]) + } else if value.Valid { + _m.IsAdmin = value.Bool + } + case users.FieldCreatedAt: + if value, ok := values[i].(*sql.NullTime); !ok { + return fmt.Errorf("unexpected type %T for field created_at", values[i]) + } else if value.Valid { + _m.CreatedAt = value.Time + } + case users.FieldUpdatedAt: + if value, ok := values[i].(*sql.NullTime); !ok { + return fmt.Errorf("unexpected type %T for field updated_at", values[i]) + } else if value.Valid { + _m.UpdatedAt = value.Time + } + case users.FieldDeletedAt: + if value, ok := values[i].(*sql.NullTime); !ok { + return fmt.Errorf("unexpected type %T for field deleted_at", values[i]) + } else if value.Valid { + _m.DeletedAt = value.Time + } + default: + _m.selectValues.Set(columns[i], values[i]) + } + } + return nil +} + +// Value returns the ent.Value that was dynamically selected and assigned to the Users. +// This includes values selected through modifiers, order, etc. +func (_m *Users) Value(name string) (ent.Value, error) { + return _m.selectValues.Get(name) +} + +// Update returns a builder for updating this Users. +// Note that you need to call Users.Unwrap() before calling this method if this Users +// was returned from a transaction, and the transaction was committed or rolled back. +func (_m *Users) Update() *UsersUpdateOne { + return NewUsersClient(_m.config).UpdateOne(_m) +} + +// Unwrap unwraps the Users entity that was returned from a transaction after it was closed, +// so that all future queries will be executed through the driver which created the transaction. +func (_m *Users) Unwrap() *Users { + _tx, ok := _m.config.driver.(*txDriver) + if !ok { + panic("models: Users is not a transactional entity") + } + _m.config.driver = _tx.drv + return _m +} + +// String implements the fmt.Stringer. +func (_m *Users) String() string { + var builder strings.Builder + builder.WriteString("Users(") + builder.WriteString(fmt.Sprintf("id=%v, ", _m.ID)) + builder.WriteString("username=") + builder.WriteString(_m.Username) + builder.WriteString(", ") + builder.WriteString("password_hash=") + builder.WriteString(_m.PasswordHash) + builder.WriteString(", ") + builder.WriteString("email=") + builder.WriteString(_m.Email) + builder.WriteString(", ") + builder.WriteString("phone=") + builder.WriteString(_m.Phone) + builder.WriteString(", ") + builder.WriteString("nickname=") + builder.WriteString(_m.Nickname) + builder.WriteString(", ") + builder.WriteString("avatar=") + builder.WriteString(_m.Avatar) + builder.WriteString(", ") + builder.WriteString("bio=") + builder.WriteString(_m.Bio) + builder.WriteString(", ") + builder.WriteString("current_role=") + builder.WriteString(_m.CurrentRole) + builder.WriteString(", ") + builder.WriteString("verified_roles=") + builder.WriteString(fmt.Sprintf("%v", _m.VerifiedRoles)) + builder.WriteString(", ") + builder.WriteString("verificationStatus=") + builder.WriteString(fmt.Sprintf("%v", _m.VerificationStatus)) + builder.WriteString(", ") + builder.WriteString("is_admin=") + builder.WriteString(fmt.Sprintf("%v", _m.IsAdmin)) + builder.WriteString(", ") + builder.WriteString("created_at=") + builder.WriteString(_m.CreatedAt.Format(time.ANSIC)) + builder.WriteString(", ") + builder.WriteString("updated_at=") + builder.WriteString(_m.UpdatedAt.Format(time.ANSIC)) + builder.WriteString(", ") + builder.WriteString("deleted_at=") + builder.WriteString(_m.DeletedAt.Format(time.ANSIC)) + builder.WriteByte(')') + return builder.String() +} + +// UsersSlice is a parsable slice of Users. +type UsersSlice []*Users diff --git a/app/users/rpc/internal/models/users/users.go b/app/users/rpc/internal/models/users/users.go new file mode 100644 index 0000000..c50559c --- /dev/null +++ b/app/users/rpc/internal/models/users/users.go @@ -0,0 +1,152 @@ +// Code generated by ent, DO NOT EDIT. + +package users + +import ( + "time" + + "entgo.io/ent/dialect/sql" +) + +const ( + // Label holds the string label denoting the users type in the database. + Label = "users" + // FieldID holds the string denoting the id field in the database. + FieldID = "id" + // FieldUsername holds the string denoting the username field in the database. + FieldUsername = "username" + // FieldPasswordHash holds the string denoting the password_hash field in the database. + FieldPasswordHash = "password_hash" + // FieldEmail holds the string denoting the email field in the database. + FieldEmail = "email" + // FieldPhone holds the string denoting the phone field in the database. + FieldPhone = "phone" + // FieldNickname holds the string denoting the nickname field in the database. + FieldNickname = "nickname" + // FieldAvatar holds the string denoting the avatar field in the database. + FieldAvatar = "avatar" + // FieldBio holds the string denoting the bio field in the database. + FieldBio = "bio" + // FieldCurrentRole holds the string denoting the current_role field in the database. + FieldCurrentRole = "current_role" + // FieldVerifiedRoles holds the string denoting the verified_roles field in the database. + FieldVerifiedRoles = "verified_roles" + // FieldVerificationStatus holds the string denoting the verificationstatus field in the database. + FieldVerificationStatus = "verification_status" + // FieldIsAdmin holds the string denoting the is_admin field in the database. + FieldIsAdmin = "is_admin" + // FieldCreatedAt holds the string denoting the created_at field in the database. + FieldCreatedAt = "created_at" + // FieldUpdatedAt holds the string denoting the updated_at field in the database. + FieldUpdatedAt = "updated_at" + // FieldDeletedAt holds the string denoting the deleted_at field in the database. + FieldDeletedAt = "deleted_at" + // Table holds the table name of the users in the database. + Table = "users" +) + +// Columns holds all SQL columns for users fields. +var Columns = []string{ + FieldID, + FieldUsername, + FieldPasswordHash, + FieldEmail, + FieldPhone, + FieldNickname, + FieldAvatar, + FieldBio, + FieldCurrentRole, + FieldVerifiedRoles, + FieldVerificationStatus, + FieldIsAdmin, + FieldCreatedAt, + FieldUpdatedAt, + FieldDeletedAt, +} + +// ValidColumn reports if the column name is valid (part of the table columns). +func ValidColumn(column string) bool { + for i := range Columns { + if column == Columns[i] { + return true + } + } + return false +} + +var ( + // DefaultIsAdmin holds the default value on creation for the "is_admin" field. + DefaultIsAdmin bool + // DefaultCreatedAt holds the default value on creation for the "created_at" field. + DefaultCreatedAt func() time.Time + // DefaultUpdatedAt holds the default value on creation for the "updated_at" field. + DefaultUpdatedAt func() time.Time +) + +// OrderOption defines the ordering options for the Users queries. +type OrderOption func(*sql.Selector) + +// ByID orders the results by the id field. +func ByID(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldID, opts...).ToFunc() +} + +// ByUsername orders the results by the username field. +func ByUsername(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldUsername, opts...).ToFunc() +} + +// ByPasswordHash orders the results by the password_hash field. +func ByPasswordHash(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldPasswordHash, opts...).ToFunc() +} + +// ByEmail orders the results by the email field. +func ByEmail(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldEmail, opts...).ToFunc() +} + +// ByPhone orders the results by the phone field. +func ByPhone(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldPhone, opts...).ToFunc() +} + +// ByNickname orders the results by the nickname field. +func ByNickname(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldNickname, opts...).ToFunc() +} + +// ByAvatar orders the results by the avatar field. +func ByAvatar(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldAvatar, opts...).ToFunc() +} + +// ByBio orders the results by the bio field. +func ByBio(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldBio, opts...).ToFunc() +} + +// ByCurrentRole orders the results by the current_role field. +func ByCurrentRole(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldCurrentRole, opts...).ToFunc() +} + +// ByIsAdmin orders the results by the is_admin field. +func ByIsAdmin(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldIsAdmin, opts...).ToFunc() +} + +// ByCreatedAt orders the results by the created_at field. +func ByCreatedAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldCreatedAt, opts...).ToFunc() +} + +// ByUpdatedAt orders the results by the updated_at field. +func ByUpdatedAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldUpdatedAt, opts...).ToFunc() +} + +// ByDeletedAt orders the results by the deleted_at field. +func ByDeletedAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldDeletedAt, opts...).ToFunc() +} diff --git a/app/users/rpc/internal/models/users/where.go b/app/users/rpc/internal/models/users/where.go new file mode 100644 index 0000000..99325dc --- /dev/null +++ b/app/users/rpc/internal/models/users/where.go @@ -0,0 +1,780 @@ +// Code generated by ent, DO NOT EDIT. + +package users + +import ( + "juwan-backend/app/users/rpc/internal/models/predicate" + "time" + + "entgo.io/ent/dialect/sql" +) + +// ID filters vertices based on their ID field. +func ID(id int64) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldID, id)) +} + +// IDEQ applies the EQ predicate on the ID field. +func IDEQ(id int64) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldID, id)) +} + +// IDNEQ applies the NEQ predicate on the ID field. +func IDNEQ(id int64) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldID, id)) +} + +// IDIn applies the In predicate on the ID field. +func IDIn(ids ...int64) predicate.Users { + return predicate.Users(sql.FieldIn(FieldID, ids...)) +} + +// IDNotIn applies the NotIn predicate on the ID field. +func IDNotIn(ids ...int64) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldID, ids...)) +} + +// IDGT applies the GT predicate on the ID field. +func IDGT(id int64) predicate.Users { + return predicate.Users(sql.FieldGT(FieldID, id)) +} + +// IDGTE applies the GTE predicate on the ID field. +func IDGTE(id int64) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldID, id)) +} + +// IDLT applies the LT predicate on the ID field. +func IDLT(id int64) predicate.Users { + return predicate.Users(sql.FieldLT(FieldID, id)) +} + +// IDLTE applies the LTE predicate on the ID field. +func IDLTE(id int64) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldID, id)) +} + +// Username applies equality check predicate on the "username" field. It's identical to UsernameEQ. +func Username(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldUsername, v)) +} + +// PasswordHash applies equality check predicate on the "password_hash" field. It's identical to PasswordHashEQ. +func PasswordHash(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldPasswordHash, v)) +} + +// Email applies equality check predicate on the "email" field. It's identical to EmailEQ. +func Email(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldEmail, v)) +} + +// Phone applies equality check predicate on the "phone" field. It's identical to PhoneEQ. +func Phone(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldPhone, v)) +} + +// Nickname applies equality check predicate on the "nickname" field. It's identical to NicknameEQ. +func Nickname(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldNickname, v)) +} + +// Avatar applies equality check predicate on the "avatar" field. It's identical to AvatarEQ. +func Avatar(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldAvatar, v)) +} + +// Bio applies equality check predicate on the "bio" field. It's identical to BioEQ. +func Bio(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldBio, v)) +} + +// CurrentRole applies equality check predicate on the "current_role" field. It's identical to CurrentRoleEQ. +func CurrentRole(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldCurrentRole, v)) +} + +// IsAdmin applies equality check predicate on the "is_admin" field. It's identical to IsAdminEQ. +func IsAdmin(v bool) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldIsAdmin, v)) +} + +// CreatedAt applies equality check predicate on the "created_at" field. It's identical to CreatedAtEQ. +func CreatedAt(v time.Time) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldCreatedAt, v)) +} + +// UpdatedAt applies equality check predicate on the "updated_at" field. It's identical to UpdatedAtEQ. +func UpdatedAt(v time.Time) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldUpdatedAt, v)) +} + +// DeletedAt applies equality check predicate on the "deleted_at" field. It's identical to DeletedAtEQ. +func DeletedAt(v time.Time) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldDeletedAt, v)) +} + +// UsernameEQ applies the EQ predicate on the "username" field. +func UsernameEQ(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldUsername, v)) +} + +// UsernameNEQ applies the NEQ predicate on the "username" field. +func UsernameNEQ(v string) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldUsername, v)) +} + +// UsernameIn applies the In predicate on the "username" field. +func UsernameIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldIn(FieldUsername, vs...)) +} + +// UsernameNotIn applies the NotIn predicate on the "username" field. +func UsernameNotIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldUsername, vs...)) +} + +// UsernameGT applies the GT predicate on the "username" field. +func UsernameGT(v string) predicate.Users { + return predicate.Users(sql.FieldGT(FieldUsername, v)) +} + +// UsernameGTE applies the GTE predicate on the "username" field. +func UsernameGTE(v string) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldUsername, v)) +} + +// UsernameLT applies the LT predicate on the "username" field. +func UsernameLT(v string) predicate.Users { + return predicate.Users(sql.FieldLT(FieldUsername, v)) +} + +// UsernameLTE applies the LTE predicate on the "username" field. +func UsernameLTE(v string) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldUsername, v)) +} + +// UsernameContains applies the Contains predicate on the "username" field. +func UsernameContains(v string) predicate.Users { + return predicate.Users(sql.FieldContains(FieldUsername, v)) +} + +// UsernameHasPrefix applies the HasPrefix predicate on the "username" field. +func UsernameHasPrefix(v string) predicate.Users { + return predicate.Users(sql.FieldHasPrefix(FieldUsername, v)) +} + +// UsernameHasSuffix applies the HasSuffix predicate on the "username" field. +func UsernameHasSuffix(v string) predicate.Users { + return predicate.Users(sql.FieldHasSuffix(FieldUsername, v)) +} + +// UsernameEqualFold applies the EqualFold predicate on the "username" field. +func UsernameEqualFold(v string) predicate.Users { + return predicate.Users(sql.FieldEqualFold(FieldUsername, v)) +} + +// UsernameContainsFold applies the ContainsFold predicate on the "username" field. +func UsernameContainsFold(v string) predicate.Users { + return predicate.Users(sql.FieldContainsFold(FieldUsername, v)) +} + +// PasswordHashEQ applies the EQ predicate on the "password_hash" field. +func PasswordHashEQ(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldPasswordHash, v)) +} + +// PasswordHashNEQ applies the NEQ predicate on the "password_hash" field. +func PasswordHashNEQ(v string) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldPasswordHash, v)) +} + +// PasswordHashIn applies the In predicate on the "password_hash" field. +func PasswordHashIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldIn(FieldPasswordHash, vs...)) +} + +// PasswordHashNotIn applies the NotIn predicate on the "password_hash" field. +func PasswordHashNotIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldPasswordHash, vs...)) +} + +// PasswordHashGT applies the GT predicate on the "password_hash" field. +func PasswordHashGT(v string) predicate.Users { + return predicate.Users(sql.FieldGT(FieldPasswordHash, v)) +} + +// PasswordHashGTE applies the GTE predicate on the "password_hash" field. +func PasswordHashGTE(v string) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldPasswordHash, v)) +} + +// PasswordHashLT applies the LT predicate on the "password_hash" field. +func PasswordHashLT(v string) predicate.Users { + return predicate.Users(sql.FieldLT(FieldPasswordHash, v)) +} + +// PasswordHashLTE applies the LTE predicate on the "password_hash" field. +func PasswordHashLTE(v string) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldPasswordHash, v)) +} + +// PasswordHashContains applies the Contains predicate on the "password_hash" field. +func PasswordHashContains(v string) predicate.Users { + return predicate.Users(sql.FieldContains(FieldPasswordHash, v)) +} + +// PasswordHashHasPrefix applies the HasPrefix predicate on the "password_hash" field. +func PasswordHashHasPrefix(v string) predicate.Users { + return predicate.Users(sql.FieldHasPrefix(FieldPasswordHash, v)) +} + +// PasswordHashHasSuffix applies the HasSuffix predicate on the "password_hash" field. +func PasswordHashHasSuffix(v string) predicate.Users { + return predicate.Users(sql.FieldHasSuffix(FieldPasswordHash, v)) +} + +// PasswordHashEqualFold applies the EqualFold predicate on the "password_hash" field. +func PasswordHashEqualFold(v string) predicate.Users { + return predicate.Users(sql.FieldEqualFold(FieldPasswordHash, v)) +} + +// PasswordHashContainsFold applies the ContainsFold predicate on the "password_hash" field. +func PasswordHashContainsFold(v string) predicate.Users { + return predicate.Users(sql.FieldContainsFold(FieldPasswordHash, v)) +} + +// EmailEQ applies the EQ predicate on the "email" field. +func EmailEQ(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldEmail, v)) +} + +// EmailNEQ applies the NEQ predicate on the "email" field. +func EmailNEQ(v string) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldEmail, v)) +} + +// EmailIn applies the In predicate on the "email" field. +func EmailIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldIn(FieldEmail, vs...)) +} + +// EmailNotIn applies the NotIn predicate on the "email" field. +func EmailNotIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldEmail, vs...)) +} + +// EmailGT applies the GT predicate on the "email" field. +func EmailGT(v string) predicate.Users { + return predicate.Users(sql.FieldGT(FieldEmail, v)) +} + +// EmailGTE applies the GTE predicate on the "email" field. +func EmailGTE(v string) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldEmail, v)) +} + +// EmailLT applies the LT predicate on the "email" field. +func EmailLT(v string) predicate.Users { + return predicate.Users(sql.FieldLT(FieldEmail, v)) +} + +// EmailLTE applies the LTE predicate on the "email" field. +func EmailLTE(v string) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldEmail, v)) +} + +// EmailContains applies the Contains predicate on the "email" field. +func EmailContains(v string) predicate.Users { + return predicate.Users(sql.FieldContains(FieldEmail, v)) +} + +// EmailHasPrefix applies the HasPrefix predicate on the "email" field. +func EmailHasPrefix(v string) predicate.Users { + return predicate.Users(sql.FieldHasPrefix(FieldEmail, v)) +} + +// EmailHasSuffix applies the HasSuffix predicate on the "email" field. +func EmailHasSuffix(v string) predicate.Users { + return predicate.Users(sql.FieldHasSuffix(FieldEmail, v)) +} + +// EmailEqualFold applies the EqualFold predicate on the "email" field. +func EmailEqualFold(v string) predicate.Users { + return predicate.Users(sql.FieldEqualFold(FieldEmail, v)) +} + +// EmailContainsFold applies the ContainsFold predicate on the "email" field. +func EmailContainsFold(v string) predicate.Users { + return predicate.Users(sql.FieldContainsFold(FieldEmail, v)) +} + +// PhoneEQ applies the EQ predicate on the "phone" field. +func PhoneEQ(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldPhone, v)) +} + +// PhoneNEQ applies the NEQ predicate on the "phone" field. +func PhoneNEQ(v string) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldPhone, v)) +} + +// PhoneIn applies the In predicate on the "phone" field. +func PhoneIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldIn(FieldPhone, vs...)) +} + +// PhoneNotIn applies the NotIn predicate on the "phone" field. +func PhoneNotIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldPhone, vs...)) +} + +// PhoneGT applies the GT predicate on the "phone" field. +func PhoneGT(v string) predicate.Users { + return predicate.Users(sql.FieldGT(FieldPhone, v)) +} + +// PhoneGTE applies the GTE predicate on the "phone" field. +func PhoneGTE(v string) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldPhone, v)) +} + +// PhoneLT applies the LT predicate on the "phone" field. +func PhoneLT(v string) predicate.Users { + return predicate.Users(sql.FieldLT(FieldPhone, v)) +} + +// PhoneLTE applies the LTE predicate on the "phone" field. +func PhoneLTE(v string) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldPhone, v)) +} + +// PhoneContains applies the Contains predicate on the "phone" field. +func PhoneContains(v string) predicate.Users { + return predicate.Users(sql.FieldContains(FieldPhone, v)) +} + +// PhoneHasPrefix applies the HasPrefix predicate on the "phone" field. +func PhoneHasPrefix(v string) predicate.Users { + return predicate.Users(sql.FieldHasPrefix(FieldPhone, v)) +} + +// PhoneHasSuffix applies the HasSuffix predicate on the "phone" field. +func PhoneHasSuffix(v string) predicate.Users { + return predicate.Users(sql.FieldHasSuffix(FieldPhone, v)) +} + +// PhoneEqualFold applies the EqualFold predicate on the "phone" field. +func PhoneEqualFold(v string) predicate.Users { + return predicate.Users(sql.FieldEqualFold(FieldPhone, v)) +} + +// PhoneContainsFold applies the ContainsFold predicate on the "phone" field. +func PhoneContainsFold(v string) predicate.Users { + return predicate.Users(sql.FieldContainsFold(FieldPhone, v)) +} + +// NicknameEQ applies the EQ predicate on the "nickname" field. +func NicknameEQ(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldNickname, v)) +} + +// NicknameNEQ applies the NEQ predicate on the "nickname" field. +func NicknameNEQ(v string) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldNickname, v)) +} + +// NicknameIn applies the In predicate on the "nickname" field. +func NicknameIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldIn(FieldNickname, vs...)) +} + +// NicknameNotIn applies the NotIn predicate on the "nickname" field. +func NicknameNotIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldNickname, vs...)) +} + +// NicknameGT applies the GT predicate on the "nickname" field. +func NicknameGT(v string) predicate.Users { + return predicate.Users(sql.FieldGT(FieldNickname, v)) +} + +// NicknameGTE applies the GTE predicate on the "nickname" field. +func NicknameGTE(v string) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldNickname, v)) +} + +// NicknameLT applies the LT predicate on the "nickname" field. +func NicknameLT(v string) predicate.Users { + return predicate.Users(sql.FieldLT(FieldNickname, v)) +} + +// NicknameLTE applies the LTE predicate on the "nickname" field. +func NicknameLTE(v string) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldNickname, v)) +} + +// NicknameContains applies the Contains predicate on the "nickname" field. +func NicknameContains(v string) predicate.Users { + return predicate.Users(sql.FieldContains(FieldNickname, v)) +} + +// NicknameHasPrefix applies the HasPrefix predicate on the "nickname" field. +func NicknameHasPrefix(v string) predicate.Users { + return predicate.Users(sql.FieldHasPrefix(FieldNickname, v)) +} + +// NicknameHasSuffix applies the HasSuffix predicate on the "nickname" field. +func NicknameHasSuffix(v string) predicate.Users { + return predicate.Users(sql.FieldHasSuffix(FieldNickname, v)) +} + +// NicknameEqualFold applies the EqualFold predicate on the "nickname" field. +func NicknameEqualFold(v string) predicate.Users { + return predicate.Users(sql.FieldEqualFold(FieldNickname, v)) +} + +// NicknameContainsFold applies the ContainsFold predicate on the "nickname" field. +func NicknameContainsFold(v string) predicate.Users { + return predicate.Users(sql.FieldContainsFold(FieldNickname, v)) +} + +// AvatarEQ applies the EQ predicate on the "avatar" field. +func AvatarEQ(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldAvatar, v)) +} + +// AvatarNEQ applies the NEQ predicate on the "avatar" field. +func AvatarNEQ(v string) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldAvatar, v)) +} + +// AvatarIn applies the In predicate on the "avatar" field. +func AvatarIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldIn(FieldAvatar, vs...)) +} + +// AvatarNotIn applies the NotIn predicate on the "avatar" field. +func AvatarNotIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldAvatar, vs...)) +} + +// AvatarGT applies the GT predicate on the "avatar" field. +func AvatarGT(v string) predicate.Users { + return predicate.Users(sql.FieldGT(FieldAvatar, v)) +} + +// AvatarGTE applies the GTE predicate on the "avatar" field. +func AvatarGTE(v string) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldAvatar, v)) +} + +// AvatarLT applies the LT predicate on the "avatar" field. +func AvatarLT(v string) predicate.Users { + return predicate.Users(sql.FieldLT(FieldAvatar, v)) +} + +// AvatarLTE applies the LTE predicate on the "avatar" field. +func AvatarLTE(v string) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldAvatar, v)) +} + +// AvatarContains applies the Contains predicate on the "avatar" field. +func AvatarContains(v string) predicate.Users { + return predicate.Users(sql.FieldContains(FieldAvatar, v)) +} + +// AvatarHasPrefix applies the HasPrefix predicate on the "avatar" field. +func AvatarHasPrefix(v string) predicate.Users { + return predicate.Users(sql.FieldHasPrefix(FieldAvatar, v)) +} + +// AvatarHasSuffix applies the HasSuffix predicate on the "avatar" field. +func AvatarHasSuffix(v string) predicate.Users { + return predicate.Users(sql.FieldHasSuffix(FieldAvatar, v)) +} + +// AvatarEqualFold applies the EqualFold predicate on the "avatar" field. +func AvatarEqualFold(v string) predicate.Users { + return predicate.Users(sql.FieldEqualFold(FieldAvatar, v)) +} + +// AvatarContainsFold applies the ContainsFold predicate on the "avatar" field. +func AvatarContainsFold(v string) predicate.Users { + return predicate.Users(sql.FieldContainsFold(FieldAvatar, v)) +} + +// BioEQ applies the EQ predicate on the "bio" field. +func BioEQ(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldBio, v)) +} + +// BioNEQ applies the NEQ predicate on the "bio" field. +func BioNEQ(v string) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldBio, v)) +} + +// BioIn applies the In predicate on the "bio" field. +func BioIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldIn(FieldBio, vs...)) +} + +// BioNotIn applies the NotIn predicate on the "bio" field. +func BioNotIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldBio, vs...)) +} + +// BioGT applies the GT predicate on the "bio" field. +func BioGT(v string) predicate.Users { + return predicate.Users(sql.FieldGT(FieldBio, v)) +} + +// BioGTE applies the GTE predicate on the "bio" field. +func BioGTE(v string) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldBio, v)) +} + +// BioLT applies the LT predicate on the "bio" field. +func BioLT(v string) predicate.Users { + return predicate.Users(sql.FieldLT(FieldBio, v)) +} + +// BioLTE applies the LTE predicate on the "bio" field. +func BioLTE(v string) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldBio, v)) +} + +// BioContains applies the Contains predicate on the "bio" field. +func BioContains(v string) predicate.Users { + return predicate.Users(sql.FieldContains(FieldBio, v)) +} + +// BioHasPrefix applies the HasPrefix predicate on the "bio" field. +func BioHasPrefix(v string) predicate.Users { + return predicate.Users(sql.FieldHasPrefix(FieldBio, v)) +} + +// BioHasSuffix applies the HasSuffix predicate on the "bio" field. +func BioHasSuffix(v string) predicate.Users { + return predicate.Users(sql.FieldHasSuffix(FieldBio, v)) +} + +// BioEqualFold applies the EqualFold predicate on the "bio" field. +func BioEqualFold(v string) predicate.Users { + return predicate.Users(sql.FieldEqualFold(FieldBio, v)) +} + +// BioContainsFold applies the ContainsFold predicate on the "bio" field. +func BioContainsFold(v string) predicate.Users { + return predicate.Users(sql.FieldContainsFold(FieldBio, v)) +} + +// CurrentRoleEQ applies the EQ predicate on the "current_role" field. +func CurrentRoleEQ(v string) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldCurrentRole, v)) +} + +// CurrentRoleNEQ applies the NEQ predicate on the "current_role" field. +func CurrentRoleNEQ(v string) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldCurrentRole, v)) +} + +// CurrentRoleIn applies the In predicate on the "current_role" field. +func CurrentRoleIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldIn(FieldCurrentRole, vs...)) +} + +// CurrentRoleNotIn applies the NotIn predicate on the "current_role" field. +func CurrentRoleNotIn(vs ...string) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldCurrentRole, vs...)) +} + +// CurrentRoleGT applies the GT predicate on the "current_role" field. +func CurrentRoleGT(v string) predicate.Users { + return predicate.Users(sql.FieldGT(FieldCurrentRole, v)) +} + +// CurrentRoleGTE applies the GTE predicate on the "current_role" field. +func CurrentRoleGTE(v string) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldCurrentRole, v)) +} + +// CurrentRoleLT applies the LT predicate on the "current_role" field. +func CurrentRoleLT(v string) predicate.Users { + return predicate.Users(sql.FieldLT(FieldCurrentRole, v)) +} + +// CurrentRoleLTE applies the LTE predicate on the "current_role" field. +func CurrentRoleLTE(v string) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldCurrentRole, v)) +} + +// CurrentRoleContains applies the Contains predicate on the "current_role" field. +func CurrentRoleContains(v string) predicate.Users { + return predicate.Users(sql.FieldContains(FieldCurrentRole, v)) +} + +// CurrentRoleHasPrefix applies the HasPrefix predicate on the "current_role" field. +func CurrentRoleHasPrefix(v string) predicate.Users { + return predicate.Users(sql.FieldHasPrefix(FieldCurrentRole, v)) +} + +// CurrentRoleHasSuffix applies the HasSuffix predicate on the "current_role" field. +func CurrentRoleHasSuffix(v string) predicate.Users { + return predicate.Users(sql.FieldHasSuffix(FieldCurrentRole, v)) +} + +// CurrentRoleEqualFold applies the EqualFold predicate on the "current_role" field. +func CurrentRoleEqualFold(v string) predicate.Users { + return predicate.Users(sql.FieldEqualFold(FieldCurrentRole, v)) +} + +// CurrentRoleContainsFold applies the ContainsFold predicate on the "current_role" field. +func CurrentRoleContainsFold(v string) predicate.Users { + return predicate.Users(sql.FieldContainsFold(FieldCurrentRole, v)) +} + +// IsAdminEQ applies the EQ predicate on the "is_admin" field. +func IsAdminEQ(v bool) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldIsAdmin, v)) +} + +// IsAdminNEQ applies the NEQ predicate on the "is_admin" field. +func IsAdminNEQ(v bool) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldIsAdmin, v)) +} + +// CreatedAtEQ applies the EQ predicate on the "created_at" field. +func CreatedAtEQ(v time.Time) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldCreatedAt, v)) +} + +// CreatedAtNEQ applies the NEQ predicate on the "created_at" field. +func CreatedAtNEQ(v time.Time) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldCreatedAt, v)) +} + +// CreatedAtIn applies the In predicate on the "created_at" field. +func CreatedAtIn(vs ...time.Time) predicate.Users { + return predicate.Users(sql.FieldIn(FieldCreatedAt, vs...)) +} + +// CreatedAtNotIn applies the NotIn predicate on the "created_at" field. +func CreatedAtNotIn(vs ...time.Time) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldCreatedAt, vs...)) +} + +// CreatedAtGT applies the GT predicate on the "created_at" field. +func CreatedAtGT(v time.Time) predicate.Users { + return predicate.Users(sql.FieldGT(FieldCreatedAt, v)) +} + +// CreatedAtGTE applies the GTE predicate on the "created_at" field. +func CreatedAtGTE(v time.Time) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldCreatedAt, v)) +} + +// CreatedAtLT applies the LT predicate on the "created_at" field. +func CreatedAtLT(v time.Time) predicate.Users { + return predicate.Users(sql.FieldLT(FieldCreatedAt, v)) +} + +// CreatedAtLTE applies the LTE predicate on the "created_at" field. +func CreatedAtLTE(v time.Time) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldCreatedAt, v)) +} + +// UpdatedAtEQ applies the EQ predicate on the "updated_at" field. +func UpdatedAtEQ(v time.Time) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldUpdatedAt, v)) +} + +// UpdatedAtNEQ applies the NEQ predicate on the "updated_at" field. +func UpdatedAtNEQ(v time.Time) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldUpdatedAt, v)) +} + +// UpdatedAtIn applies the In predicate on the "updated_at" field. +func UpdatedAtIn(vs ...time.Time) predicate.Users { + return predicate.Users(sql.FieldIn(FieldUpdatedAt, vs...)) +} + +// UpdatedAtNotIn applies the NotIn predicate on the "updated_at" field. +func UpdatedAtNotIn(vs ...time.Time) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldUpdatedAt, vs...)) +} + +// UpdatedAtGT applies the GT predicate on the "updated_at" field. +func UpdatedAtGT(v time.Time) predicate.Users { + return predicate.Users(sql.FieldGT(FieldUpdatedAt, v)) +} + +// UpdatedAtGTE applies the GTE predicate on the "updated_at" field. +func UpdatedAtGTE(v time.Time) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldUpdatedAt, v)) +} + +// UpdatedAtLT applies the LT predicate on the "updated_at" field. +func UpdatedAtLT(v time.Time) predicate.Users { + return predicate.Users(sql.FieldLT(FieldUpdatedAt, v)) +} + +// UpdatedAtLTE applies the LTE predicate on the "updated_at" field. +func UpdatedAtLTE(v time.Time) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldUpdatedAt, v)) +} + +// DeletedAtEQ applies the EQ predicate on the "deleted_at" field. +func DeletedAtEQ(v time.Time) predicate.Users { + return predicate.Users(sql.FieldEQ(FieldDeletedAt, v)) +} + +// DeletedAtNEQ applies the NEQ predicate on the "deleted_at" field. +func DeletedAtNEQ(v time.Time) predicate.Users { + return predicate.Users(sql.FieldNEQ(FieldDeletedAt, v)) +} + +// DeletedAtIn applies the In predicate on the "deleted_at" field. +func DeletedAtIn(vs ...time.Time) predicate.Users { + return predicate.Users(sql.FieldIn(FieldDeletedAt, vs...)) +} + +// DeletedAtNotIn applies the NotIn predicate on the "deleted_at" field. +func DeletedAtNotIn(vs ...time.Time) predicate.Users { + return predicate.Users(sql.FieldNotIn(FieldDeletedAt, vs...)) +} + +// DeletedAtGT applies the GT predicate on the "deleted_at" field. +func DeletedAtGT(v time.Time) predicate.Users { + return predicate.Users(sql.FieldGT(FieldDeletedAt, v)) +} + +// DeletedAtGTE applies the GTE predicate on the "deleted_at" field. +func DeletedAtGTE(v time.Time) predicate.Users { + return predicate.Users(sql.FieldGTE(FieldDeletedAt, v)) +} + +// DeletedAtLT applies the LT predicate on the "deleted_at" field. +func DeletedAtLT(v time.Time) predicate.Users { + return predicate.Users(sql.FieldLT(FieldDeletedAt, v)) +} + +// DeletedAtLTE applies the LTE predicate on the "deleted_at" field. +func DeletedAtLTE(v time.Time) predicate.Users { + return predicate.Users(sql.FieldLTE(FieldDeletedAt, v)) +} + +// And groups predicates with the AND operator between them. +func And(predicates ...predicate.Users) predicate.Users { + return predicate.Users(sql.AndPredicates(predicates...)) +} + +// Or groups predicates with the OR operator between them. +func Or(predicates ...predicate.Users) predicate.Users { + return predicate.Users(sql.OrPredicates(predicates...)) +} + +// Not applies the not operator on the given predicate. +func Not(p predicate.Users) predicate.Users { + return predicate.Users(sql.NotPredicates(p)) +} diff --git a/app/users/rpc/internal/models/usersModel.go b/app/users/rpc/internal/models/usersModel.go deleted file mode 100644 index a4aa649..0000000 --- a/app/users/rpc/internal/models/usersModel.go +++ /dev/null @@ -1,27 +0,0 @@ -package models - -import ( - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) - -var _ UsersModel = (*customUsersModel)(nil) - -type ( - // UsersModel is an interface to be customized, add more methods here, - // and implement the added methods in customUsersModel. - UsersModel interface { - usersModel - } - - customUsersModel struct { - *defaultUsersModel - } -) - -// NewUsersModel returns a model for the database table. -func NewUsersModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) UsersModel { - return &customUsersModel{ - defaultUsersModel: newUsersModel(conn, c, opts...), - } -} diff --git a/app/users/rpc/internal/models/usersModel_gen.go b/app/users/rpc/internal/models/usersModel_gen.go deleted file mode 100644 index 9919251..0000000 --- a/app/users/rpc/internal/models/usersModel_gen.go +++ /dev/null @@ -1,206 +0,0 @@ -// Code generated by goctl. DO NOT EDIT. -// versions: -// goctl version: 1.9.2 - -package models - -import ( - "context" - "database/sql" - "fmt" - "strings" - "time" - - "github.com/zeromicro/go-zero/core/stores/builder" - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlc" - "github.com/zeromicro/go-zero/core/stores/sqlx" - "github.com/zeromicro/go-zero/core/stringx" -) - -var ( - usersFieldNames = builder.RawFieldNames(&Users{}, true) - usersRows = strings.Join(usersFieldNames, ",") - usersRowsExpectAutoSet = strings.Join(stringx.Remove(usersFieldNames, "create_at", "create_time", "created_at", "update_at", "update_time", "updated_at"), ",") - usersRowsWithPlaceHolder = builder.PostgreSqlJoin(stringx.Remove(usersFieldNames, "user_id", "create_at", "create_time", "created_at", "update_at", "update_time", "updated_at")) - - cachePublicUsersUserIdPrefix = "cache:public:users:userId:" - cachePublicUsersEmailPrefix = "cache:public:users:email:" - cachePublicUsersPhonePrefix = "cache:public:users:phone:" - cachePublicUsersUsernamePrefix = "cache:public:users:username:" -) - -type ( - usersModel interface { - Insert(ctx context.Context, data *Users) (sql.Result, error) - FindOne(ctx context.Context, userId int64) (*Users, error) - FindOneByEmail(ctx context.Context, email string) (*Users, error) - FindOneByPhone(ctx context.Context, phone string) (*Users, error) - FindOneByUsername(ctx context.Context, username string) (*Users, error) - Update(ctx context.Context, data *Users) error - Delete(ctx context.Context, userId int64) error - } - - defaultUsersModel struct { - sqlc.CachedConn - table string - } - - Users struct { - UserId int64 `db:"user_id"` - Username string `db:"username"` - Passwd string `db:"passwd"` - Nickname string `db:"nickname"` - Phone string `db:"phone"` - RoleType int64 `db:"role_type"` - IsVerified bool `db:"is_verified"` - State bool `db:"state"` - CreatedAt time.Time `db:"created_at"` - UpdatedAt time.Time `db:"updated_at"` - DeletedAt sql.NullTime `db:"deleted_at"` - Email string `db:"email"` - } -) - -func newUsersModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultUsersModel { - return &defaultUsersModel{ - CachedConn: sqlc.NewConn(conn, c, opts...), - table: `"public"."users"`, - } -} - -func (m *defaultUsersModel) Delete(ctx context.Context, userId int64) error { - data, err := m.FindOne(ctx, userId) - if err != nil { - return err - } - - publicUsersEmailKey := fmt.Sprintf("%s%v", cachePublicUsersEmailPrefix, data.Email) - publicUsersPhoneKey := fmt.Sprintf("%s%v", cachePublicUsersPhonePrefix, data.Phone) - publicUsersUserIdKey := fmt.Sprintf("%s%v", cachePublicUsersUserIdPrefix, userId) - publicUsersUsernameKey := fmt.Sprintf("%s%v", cachePublicUsersUsernamePrefix, data.Username) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("delete from %s where user_id = $1", m.table) - return conn.ExecCtx(ctx, query, userId) - }, publicUsersEmailKey, publicUsersPhoneKey, publicUsersUserIdKey, publicUsersUsernameKey) - return err -} - -func (m *defaultUsersModel) FindOne(ctx context.Context, userId int64) (*Users, error) { - publicUsersUserIdKey := fmt.Sprintf("%s%v", cachePublicUsersUserIdPrefix, userId) - var resp Users - err := m.QueryRowCtx(ctx, &resp, publicUsersUserIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error { - query := fmt.Sprintf("select %s from %s where user_id = $1 limit 1", usersRows, m.table) - return conn.QueryRowCtx(ctx, v, query, userId) - }) - switch err { - case nil: - return &resp, nil - case sqlc.ErrNotFound: - return nil, ErrNotFound - default: - return nil, err - } -} - -func (m *defaultUsersModel) FindOneByEmail(ctx context.Context, email string) (*Users, error) { - publicUsersEmailKey := fmt.Sprintf("%s%v", cachePublicUsersEmailPrefix, email) - var resp Users - err := m.QueryRowIndexCtx(ctx, &resp, publicUsersEmailKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) { - query := fmt.Sprintf("select %s from %s where email = $1 limit 1", usersRows, m.table) - if err := conn.QueryRowCtx(ctx, &resp, query, email); err != nil { - return nil, err - } - return resp.UserId, nil - }, m.queryPrimary) - switch err { - case nil: - return &resp, nil - case sqlc.ErrNotFound: - return nil, ErrNotFound - default: - return nil, err - } -} - -func (m *defaultUsersModel) FindOneByPhone(ctx context.Context, phone string) (*Users, error) { - publicUsersPhoneKey := fmt.Sprintf("%s%v", cachePublicUsersPhonePrefix, phone) - var resp Users - err := m.QueryRowIndexCtx(ctx, &resp, publicUsersPhoneKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) { - query := fmt.Sprintf("select %s from %s where phone = $1 limit 1", usersRows, m.table) - if err := conn.QueryRowCtx(ctx, &resp, query, phone); err != nil { - return nil, err - } - return resp.UserId, nil - }, m.queryPrimary) - switch err { - case nil: - return &resp, nil - case sqlc.ErrNotFound: - return nil, ErrNotFound - default: - return nil, err - } -} - -func (m *defaultUsersModel) FindOneByUsername(ctx context.Context, username string) (*Users, error) { - publicUsersUsernameKey := fmt.Sprintf("%s%v", cachePublicUsersUsernamePrefix, username) - var resp Users - err := m.QueryRowIndexCtx(ctx, &resp, publicUsersUsernameKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) { - query := fmt.Sprintf("select %s from %s where username = $1 limit 1", usersRows, m.table) - if err := conn.QueryRowCtx(ctx, &resp, query, username); err != nil { - return nil, err - } - return resp.UserId, nil - }, m.queryPrimary) - switch err { - case nil: - return &resp, nil - case sqlc.ErrNotFound: - return nil, ErrNotFound - default: - return nil, err - } -} - -func (m *defaultUsersModel) Insert(ctx context.Context, data *Users) (sql.Result, error) { - publicUsersEmailKey := fmt.Sprintf("%s%v", cachePublicUsersEmailPrefix, data.Email) - publicUsersPhoneKey := fmt.Sprintf("%s%v", cachePublicUsersPhonePrefix, data.Phone) - publicUsersUserIdKey := fmt.Sprintf("%s%v", cachePublicUsersUserIdPrefix, data.UserId) - publicUsersUsernameKey := fmt.Sprintf("%s%v", cachePublicUsersUsernamePrefix, data.Username) - ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)", m.table, usersRowsExpectAutoSet) - return conn.ExecCtx(ctx, query, data.UserId, data.Username, data.Passwd, data.Nickname, data.Phone, data.RoleType, data.IsVerified, data.State, data.DeletedAt, data.Email) - }, publicUsersEmailKey, publicUsersPhoneKey, publicUsersUserIdKey, publicUsersUsernameKey) - return ret, err -} - -func (m *defaultUsersModel) Update(ctx context.Context, newData *Users) error { - data, err := m.FindOne(ctx, newData.UserId) - if err != nil { - return err - } - - publicUsersEmailKey := fmt.Sprintf("%s%v", cachePublicUsersEmailPrefix, data.Email) - publicUsersPhoneKey := fmt.Sprintf("%s%v", cachePublicUsersPhonePrefix, data.Phone) - publicUsersUserIdKey := fmt.Sprintf("%s%v", cachePublicUsersUserIdPrefix, data.UserId) - publicUsersUsernameKey := fmt.Sprintf("%s%v", cachePublicUsersUsernamePrefix, data.Username) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where user_id = $1", m.table, usersRowsWithPlaceHolder) - return conn.ExecCtx(ctx, query, newData.UserId, newData.Username, newData.Passwd, newData.Nickname, newData.Phone, newData.RoleType, newData.IsVerified, newData.State, newData.DeletedAt, newData.Email) - }, publicUsersEmailKey, publicUsersPhoneKey, publicUsersUserIdKey, publicUsersUsernameKey) - return err -} - -func (m *defaultUsersModel) formatPrimary(primary any) string { - return fmt.Sprintf("%s%v", cachePublicUsersUserIdPrefix, primary) -} - -func (m *defaultUsersModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error { - query := fmt.Sprintf("select %s from %s where user_id = $1 limit 1", usersRows, m.table) - return conn.QueryRowCtx(ctx, v, query, primary) -} - -func (m *defaultUsersModel) tableName() string { - return m.table -} diff --git a/app/users/rpc/internal/models/users_create.go b/app/users/rpc/internal/models/users_create.go new file mode 100644 index 0000000..2d7b608 --- /dev/null +++ b/app/users/rpc/internal/models/users_create.go @@ -0,0 +1,408 @@ +// Code generated by ent, DO NOT EDIT. + +package models + +import ( + "context" + "errors" + "fmt" + "juwan-backend/app/users/rpc/internal/models/schema" + "juwan-backend/app/users/rpc/internal/models/users" + "time" + + "entgo.io/ent/dialect/sql/sqlgraph" + "entgo.io/ent/schema/field" +) + +// UsersCreate is the builder for creating a Users entity. +type UsersCreate struct { + config + mutation *UsersMutation + hooks []Hook +} + +// SetUsername sets the "username" field. +func (_c *UsersCreate) SetUsername(v string) *UsersCreate { + _c.mutation.SetUsername(v) + return _c +} + +// SetPasswordHash sets the "password_hash" field. +func (_c *UsersCreate) SetPasswordHash(v string) *UsersCreate { + _c.mutation.SetPasswordHash(v) + return _c +} + +// SetEmail sets the "email" field. +func (_c *UsersCreate) SetEmail(v string) *UsersCreate { + _c.mutation.SetEmail(v) + return _c +} + +// SetPhone sets the "phone" field. +func (_c *UsersCreate) SetPhone(v string) *UsersCreate { + _c.mutation.SetPhone(v) + return _c +} + +// SetNickname sets the "nickname" field. +func (_c *UsersCreate) SetNickname(v string) *UsersCreate { + _c.mutation.SetNickname(v) + return _c +} + +// SetAvatar sets the "avatar" field. +func (_c *UsersCreate) SetAvatar(v string) *UsersCreate { + _c.mutation.SetAvatar(v) + return _c +} + +// SetBio sets the "bio" field. +func (_c *UsersCreate) SetBio(v string) *UsersCreate { + _c.mutation.SetBio(v) + return _c +} + +// SetCurrentRole sets the "current_role" field. +func (_c *UsersCreate) SetCurrentRole(v string) *UsersCreate { + _c.mutation.SetCurrentRole(v) + return _c +} + +// SetVerifiedRoles sets the "verified_roles" field. +func (_c *UsersCreate) SetVerifiedRoles(v []string) *UsersCreate { + _c.mutation.SetVerifiedRoles(v) + return _c +} + +// SetVerificationStatus sets the "verificationStatus" field. +func (_c *UsersCreate) SetVerificationStatus(v schema.VerificationStatusStruct) *UsersCreate { + _c.mutation.SetVerificationStatus(v) + return _c +} + +// SetIsAdmin sets the "is_admin" field. +func (_c *UsersCreate) SetIsAdmin(v bool) *UsersCreate { + _c.mutation.SetIsAdmin(v) + return _c +} + +// SetNillableIsAdmin sets the "is_admin" field if the given value is not nil. +func (_c *UsersCreate) SetNillableIsAdmin(v *bool) *UsersCreate { + if v != nil { + _c.SetIsAdmin(*v) + } + return _c +} + +// SetCreatedAt sets the "created_at" field. +func (_c *UsersCreate) SetCreatedAt(v time.Time) *UsersCreate { + _c.mutation.SetCreatedAt(v) + return _c +} + +// SetNillableCreatedAt sets the "created_at" field if the given value is not nil. +func (_c *UsersCreate) SetNillableCreatedAt(v *time.Time) *UsersCreate { + if v != nil { + _c.SetCreatedAt(*v) + } + return _c +} + +// SetUpdatedAt sets the "updated_at" field. +func (_c *UsersCreate) SetUpdatedAt(v time.Time) *UsersCreate { + _c.mutation.SetUpdatedAt(v) + return _c +} + +// SetNillableUpdatedAt sets the "updated_at" field if the given value is not nil. +func (_c *UsersCreate) SetNillableUpdatedAt(v *time.Time) *UsersCreate { + if v != nil { + _c.SetUpdatedAt(*v) + } + return _c +} + +// SetDeletedAt sets the "deleted_at" field. +func (_c *UsersCreate) SetDeletedAt(v time.Time) *UsersCreate { + _c.mutation.SetDeletedAt(v) + return _c +} + +// SetID sets the "id" field. +func (_c *UsersCreate) SetID(v int64) *UsersCreate { + _c.mutation.SetID(v) + return _c +} + +// Mutation returns the UsersMutation object of the builder. +func (_c *UsersCreate) Mutation() *UsersMutation { + return _c.mutation +} + +// Save creates the Users in the database. +func (_c *UsersCreate) Save(ctx context.Context) (*Users, error) { + _c.defaults() + return withHooks(ctx, _c.sqlSave, _c.mutation, _c.hooks) +} + +// SaveX calls Save and panics if Save returns an error. +func (_c *UsersCreate) SaveX(ctx context.Context) *Users { + v, err := _c.Save(ctx) + if err != nil { + panic(err) + } + return v +} + +// Exec executes the query. +func (_c *UsersCreate) Exec(ctx context.Context) error { + _, err := _c.Save(ctx) + return err +} + +// ExecX is like Exec, but panics if an error occurs. +func (_c *UsersCreate) ExecX(ctx context.Context) { + if err := _c.Exec(ctx); err != nil { + panic(err) + } +} + +// defaults sets the default values of the builder before save. +func (_c *UsersCreate) defaults() { + if _, ok := _c.mutation.IsAdmin(); !ok { + v := users.DefaultIsAdmin + _c.mutation.SetIsAdmin(v) + } + if _, ok := _c.mutation.CreatedAt(); !ok { + v := users.DefaultCreatedAt() + _c.mutation.SetCreatedAt(v) + } + if _, ok := _c.mutation.UpdatedAt(); !ok { + v := users.DefaultUpdatedAt() + _c.mutation.SetUpdatedAt(v) + } +} + +// check runs all checks and user-defined validators on the builder. +func (_c *UsersCreate) check() error { + if _, ok := _c.mutation.Username(); !ok { + return &ValidationError{Name: "username", err: errors.New(`models: missing required field "Users.username"`)} + } + if _, ok := _c.mutation.PasswordHash(); !ok { + return &ValidationError{Name: "password_hash", err: errors.New(`models: missing required field "Users.password_hash"`)} + } + if _, ok := _c.mutation.Email(); !ok { + return &ValidationError{Name: "email", err: errors.New(`models: missing required field "Users.email"`)} + } + if _, ok := _c.mutation.Phone(); !ok { + return &ValidationError{Name: "phone", err: errors.New(`models: missing required field "Users.phone"`)} + } + if _, ok := _c.mutation.Nickname(); !ok { + return &ValidationError{Name: "nickname", err: errors.New(`models: missing required field "Users.nickname"`)} + } + if _, ok := _c.mutation.Avatar(); !ok { + return &ValidationError{Name: "avatar", err: errors.New(`models: missing required field "Users.avatar"`)} + } + if _, ok := _c.mutation.Bio(); !ok { + return &ValidationError{Name: "bio", err: errors.New(`models: missing required field "Users.bio"`)} + } + if _, ok := _c.mutation.CurrentRole(); !ok { + return &ValidationError{Name: "current_role", err: errors.New(`models: missing required field "Users.current_role"`)} + } + if _, ok := _c.mutation.VerifiedRoles(); !ok { + return &ValidationError{Name: "verified_roles", err: errors.New(`models: missing required field "Users.verified_roles"`)} + } + if _, ok := _c.mutation.VerificationStatus(); !ok { + return &ValidationError{Name: "verificationStatus", err: errors.New(`models: missing required field "Users.verificationStatus"`)} + } + if _, ok := _c.mutation.IsAdmin(); !ok { + return &ValidationError{Name: "is_admin", err: errors.New(`models: missing required field "Users.is_admin"`)} + } + if _, ok := _c.mutation.CreatedAt(); !ok { + return &ValidationError{Name: "created_at", err: errors.New(`models: missing required field "Users.created_at"`)} + } + if _, ok := _c.mutation.UpdatedAt(); !ok { + return &ValidationError{Name: "updated_at", err: errors.New(`models: missing required field "Users.updated_at"`)} + } + if _, ok := _c.mutation.DeletedAt(); !ok { + return &ValidationError{Name: "deleted_at", err: errors.New(`models: missing required field "Users.deleted_at"`)} + } + return nil +} + +func (_c *UsersCreate) sqlSave(ctx context.Context) (*Users, error) { + if err := _c.check(); err != nil { + return nil, err + } + _node, _spec := _c.createSpec() + if err := sqlgraph.CreateNode(ctx, _c.driver, _spec); err != nil { + if sqlgraph.IsConstraintError(err) { + err = &ConstraintError{msg: err.Error(), wrap: err} + } + return nil, err + } + if _spec.ID.Value != _node.ID { + id := _spec.ID.Value.(int64) + _node.ID = int64(id) + } + _c.mutation.id = &_node.ID + _c.mutation.done = true + return _node, nil +} + +func (_c *UsersCreate) createSpec() (*Users, *sqlgraph.CreateSpec) { + var ( + _node = &Users{config: _c.config} + _spec = sqlgraph.NewCreateSpec(users.Table, sqlgraph.NewFieldSpec(users.FieldID, field.TypeInt64)) + ) + if id, ok := _c.mutation.ID(); ok { + _node.ID = id + _spec.ID.Value = id + } + if value, ok := _c.mutation.Username(); ok { + _spec.SetField(users.FieldUsername, field.TypeString, value) + _node.Username = value + } + if value, ok := _c.mutation.PasswordHash(); ok { + _spec.SetField(users.FieldPasswordHash, field.TypeString, value) + _node.PasswordHash = value + } + if value, ok := _c.mutation.Email(); ok { + _spec.SetField(users.FieldEmail, field.TypeString, value) + _node.Email = value + } + if value, ok := _c.mutation.Phone(); ok { + _spec.SetField(users.FieldPhone, field.TypeString, value) + _node.Phone = value + } + if value, ok := _c.mutation.Nickname(); ok { + _spec.SetField(users.FieldNickname, field.TypeString, value) + _node.Nickname = value + } + if value, ok := _c.mutation.Avatar(); ok { + _spec.SetField(users.FieldAvatar, field.TypeString, value) + _node.Avatar = value + } + if value, ok := _c.mutation.Bio(); ok { + _spec.SetField(users.FieldBio, field.TypeString, value) + _node.Bio = value + } + if value, ok := _c.mutation.CurrentRole(); ok { + _spec.SetField(users.FieldCurrentRole, field.TypeString, value) + _node.CurrentRole = value + } + if value, ok := _c.mutation.VerifiedRoles(); ok { + _spec.SetField(users.FieldVerifiedRoles, field.TypeJSON, value) + _node.VerifiedRoles = value + } + if value, ok := _c.mutation.VerificationStatus(); ok { + _spec.SetField(users.FieldVerificationStatus, field.TypeJSON, value) + _node.VerificationStatus = value + } + if value, ok := _c.mutation.IsAdmin(); ok { + _spec.SetField(users.FieldIsAdmin, field.TypeBool, value) + _node.IsAdmin = value + } + if value, ok := _c.mutation.CreatedAt(); ok { + _spec.SetField(users.FieldCreatedAt, field.TypeTime, value) + _node.CreatedAt = value + } + if value, ok := _c.mutation.UpdatedAt(); ok { + _spec.SetField(users.FieldUpdatedAt, field.TypeTime, value) + _node.UpdatedAt = value + } + if value, ok := _c.mutation.DeletedAt(); ok { + _spec.SetField(users.FieldDeletedAt, field.TypeTime, value) + _node.DeletedAt = value + } + return _node, _spec +} + +// UsersCreateBulk is the builder for creating many Users entities in bulk. +type UsersCreateBulk struct { + config + err error + builders []*UsersCreate +} + +// Save creates the Users entities in the database. +func (_c *UsersCreateBulk) Save(ctx context.Context) ([]*Users, error) { + if _c.err != nil { + return nil, _c.err + } + specs := make([]*sqlgraph.CreateSpec, len(_c.builders)) + nodes := make([]*Users, len(_c.builders)) + mutators := make([]Mutator, len(_c.builders)) + for i := range _c.builders { + func(i int, root context.Context) { + builder := _c.builders[i] + builder.defaults() + var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) { + mutation, ok := m.(*UsersMutation) + if !ok { + return nil, fmt.Errorf("unexpected mutation type %T", m) + } + if err := builder.check(); err != nil { + return nil, err + } + builder.mutation = mutation + var err error + nodes[i], specs[i] = builder.createSpec() + if i < len(mutators)-1 { + _, err = mutators[i+1].Mutate(root, _c.builders[i+1].mutation) + } else { + spec := &sqlgraph.BatchCreateSpec{Nodes: specs} + // Invoke the actual operation on the latest mutation in the chain. + if err = sqlgraph.BatchCreate(ctx, _c.driver, spec); err != nil { + if sqlgraph.IsConstraintError(err) { + err = &ConstraintError{msg: err.Error(), wrap: err} + } + } + } + if err != nil { + return nil, err + } + mutation.id = &nodes[i].ID + if specs[i].ID.Value != nil && nodes[i].ID == 0 { + id := specs[i].ID.Value.(int64) + nodes[i].ID = int64(id) + } + mutation.done = true + return nodes[i], nil + }) + for i := len(builder.hooks) - 1; i >= 0; i-- { + mut = builder.hooks[i](mut) + } + mutators[i] = mut + }(i, ctx) + } + if len(mutators) > 0 { + if _, err := mutators[0].Mutate(ctx, _c.builders[0].mutation); err != nil { + return nil, err + } + } + return nodes, nil +} + +// SaveX is like Save, but panics if an error occurs. +func (_c *UsersCreateBulk) SaveX(ctx context.Context) []*Users { + v, err := _c.Save(ctx) + if err != nil { + panic(err) + } + return v +} + +// Exec executes the query. +func (_c *UsersCreateBulk) Exec(ctx context.Context) error { + _, err := _c.Save(ctx) + return err +} + +// ExecX is like Exec, but panics if an error occurs. +func (_c *UsersCreateBulk) ExecX(ctx context.Context) { + if err := _c.Exec(ctx); err != nil { + panic(err) + } +} diff --git a/app/users/rpc/internal/models/users_delete.go b/app/users/rpc/internal/models/users_delete.go new file mode 100644 index 0000000..e9a2602 --- /dev/null +++ b/app/users/rpc/internal/models/users_delete.go @@ -0,0 +1,88 @@ +// Code generated by ent, DO NOT EDIT. + +package models + +import ( + "context" + "juwan-backend/app/users/rpc/internal/models/predicate" + "juwan-backend/app/users/rpc/internal/models/users" + + "entgo.io/ent/dialect/sql" + "entgo.io/ent/dialect/sql/sqlgraph" + "entgo.io/ent/schema/field" +) + +// UsersDelete is the builder for deleting a Users entity. +type UsersDelete struct { + config + hooks []Hook + mutation *UsersMutation +} + +// Where appends a list predicates to the UsersDelete builder. +func (_d *UsersDelete) Where(ps ...predicate.Users) *UsersDelete { + _d.mutation.Where(ps...) + return _d +} + +// Exec executes the deletion query and returns how many vertices were deleted. +func (_d *UsersDelete) Exec(ctx context.Context) (int, error) { + return withHooks(ctx, _d.sqlExec, _d.mutation, _d.hooks) +} + +// ExecX is like Exec, but panics if an error occurs. +func (_d *UsersDelete) ExecX(ctx context.Context) int { + n, err := _d.Exec(ctx) + if err != nil { + panic(err) + } + return n +} + +func (_d *UsersDelete) sqlExec(ctx context.Context) (int, error) { + _spec := sqlgraph.NewDeleteSpec(users.Table, sqlgraph.NewFieldSpec(users.FieldID, field.TypeInt64)) + if ps := _d.mutation.predicates; len(ps) > 0 { + _spec.Predicate = func(selector *sql.Selector) { + for i := range ps { + ps[i](selector) + } + } + } + affected, err := sqlgraph.DeleteNodes(ctx, _d.driver, _spec) + if err != nil && sqlgraph.IsConstraintError(err) { + err = &ConstraintError{msg: err.Error(), wrap: err} + } + _d.mutation.done = true + return affected, err +} + +// UsersDeleteOne is the builder for deleting a single Users entity. +type UsersDeleteOne struct { + _d *UsersDelete +} + +// Where appends a list predicates to the UsersDelete builder. +func (_d *UsersDeleteOne) Where(ps ...predicate.Users) *UsersDeleteOne { + _d._d.mutation.Where(ps...) + return _d +} + +// Exec executes the deletion query. +func (_d *UsersDeleteOne) Exec(ctx context.Context) error { + n, err := _d._d.Exec(ctx) + switch { + case err != nil: + return err + case n == 0: + return &NotFoundError{users.Label} + default: + return nil + } +} + +// ExecX is like Exec, but panics if an error occurs. +func (_d *UsersDeleteOne) ExecX(ctx context.Context) { + if err := _d.Exec(ctx); err != nil { + panic(err) + } +} diff --git a/app/users/rpc/internal/models/users_query.go b/app/users/rpc/internal/models/users_query.go new file mode 100644 index 0000000..1a90283 --- /dev/null +++ b/app/users/rpc/internal/models/users_query.go @@ -0,0 +1,527 @@ +// Code generated by ent, DO NOT EDIT. + +package models + +import ( + "context" + "fmt" + "juwan-backend/app/users/rpc/internal/models/predicate" + "juwan-backend/app/users/rpc/internal/models/users" + "math" + + "entgo.io/ent" + "entgo.io/ent/dialect/sql" + "entgo.io/ent/dialect/sql/sqlgraph" + "entgo.io/ent/schema/field" +) + +// UsersQuery is the builder for querying Users entities. +type UsersQuery struct { + config + ctx *QueryContext + order []users.OrderOption + inters []Interceptor + predicates []predicate.Users + // intermediate query (i.e. traversal path). + sql *sql.Selector + path func(context.Context) (*sql.Selector, error) +} + +// Where adds a new predicate for the UsersQuery builder. +func (_q *UsersQuery) Where(ps ...predicate.Users) *UsersQuery { + _q.predicates = append(_q.predicates, ps...) + return _q +} + +// Limit the number of records to be returned by this query. +func (_q *UsersQuery) Limit(limit int) *UsersQuery { + _q.ctx.Limit = &limit + return _q +} + +// Offset to start from. +func (_q *UsersQuery) Offset(offset int) *UsersQuery { + _q.ctx.Offset = &offset + return _q +} + +// Unique configures the query builder to filter duplicate records on query. +// By default, unique is set to true, and can be disabled using this method. +func (_q *UsersQuery) Unique(unique bool) *UsersQuery { + _q.ctx.Unique = &unique + return _q +} + +// Order specifies how the records should be ordered. +func (_q *UsersQuery) Order(o ...users.OrderOption) *UsersQuery { + _q.order = append(_q.order, o...) + return _q +} + +// First returns the first Users entity from the query. +// Returns a *NotFoundError when no Users was found. +func (_q *UsersQuery) First(ctx context.Context) (*Users, error) { + nodes, err := _q.Limit(1).All(setContextOp(ctx, _q.ctx, ent.OpQueryFirst)) + if err != nil { + return nil, err + } + if len(nodes) == 0 { + return nil, &NotFoundError{users.Label} + } + return nodes[0], nil +} + +// FirstX is like First, but panics if an error occurs. +func (_q *UsersQuery) FirstX(ctx context.Context) *Users { + node, err := _q.First(ctx) + if err != nil && !IsNotFound(err) { + panic(err) + } + return node +} + +// FirstID returns the first Users ID from the query. +// Returns a *NotFoundError when no Users ID was found. +func (_q *UsersQuery) FirstID(ctx context.Context) (id int64, err error) { + var ids []int64 + if ids, err = _q.Limit(1).IDs(setContextOp(ctx, _q.ctx, ent.OpQueryFirstID)); err != nil { + return + } + if len(ids) == 0 { + err = &NotFoundError{users.Label} + return + } + return ids[0], nil +} + +// FirstIDX is like FirstID, but panics if an error occurs. +func (_q *UsersQuery) FirstIDX(ctx context.Context) int64 { + id, err := _q.FirstID(ctx) + if err != nil && !IsNotFound(err) { + panic(err) + } + return id +} + +// Only returns a single Users entity found by the query, ensuring it only returns one. +// Returns a *NotSingularError when more than one Users entity is found. +// Returns a *NotFoundError when no Users entities are found. +func (_q *UsersQuery) Only(ctx context.Context) (*Users, error) { + nodes, err := _q.Limit(2).All(setContextOp(ctx, _q.ctx, ent.OpQueryOnly)) + if err != nil { + return nil, err + } + switch len(nodes) { + case 1: + return nodes[0], nil + case 0: + return nil, &NotFoundError{users.Label} + default: + return nil, &NotSingularError{users.Label} + } +} + +// OnlyX is like Only, but panics if an error occurs. +func (_q *UsersQuery) OnlyX(ctx context.Context) *Users { + node, err := _q.Only(ctx) + if err != nil { + panic(err) + } + return node +} + +// OnlyID is like Only, but returns the only Users ID in the query. +// Returns a *NotSingularError when more than one Users ID is found. +// Returns a *NotFoundError when no entities are found. +func (_q *UsersQuery) OnlyID(ctx context.Context) (id int64, err error) { + var ids []int64 + if ids, err = _q.Limit(2).IDs(setContextOp(ctx, _q.ctx, ent.OpQueryOnlyID)); err != nil { + return + } + switch len(ids) { + case 1: + id = ids[0] + case 0: + err = &NotFoundError{users.Label} + default: + err = &NotSingularError{users.Label} + } + return +} + +// OnlyIDX is like OnlyID, but panics if an error occurs. +func (_q *UsersQuery) OnlyIDX(ctx context.Context) int64 { + id, err := _q.OnlyID(ctx) + if err != nil { + panic(err) + } + return id +} + +// All executes the query and returns a list of UsersSlice. +func (_q *UsersQuery) All(ctx context.Context) ([]*Users, error) { + ctx = setContextOp(ctx, _q.ctx, ent.OpQueryAll) + if err := _q.prepareQuery(ctx); err != nil { + return nil, err + } + qr := querierAll[[]*Users, *UsersQuery]() + return withInterceptors[[]*Users](ctx, _q, qr, _q.inters) +} + +// AllX is like All, but panics if an error occurs. +func (_q *UsersQuery) AllX(ctx context.Context) []*Users { + nodes, err := _q.All(ctx) + if err != nil { + panic(err) + } + return nodes +} + +// IDs executes the query and returns a list of Users IDs. +func (_q *UsersQuery) IDs(ctx context.Context) (ids []int64, err error) { + if _q.ctx.Unique == nil && _q.path != nil { + _q.Unique(true) + } + ctx = setContextOp(ctx, _q.ctx, ent.OpQueryIDs) + if err = _q.Select(users.FieldID).Scan(ctx, &ids); err != nil { + return nil, err + } + return ids, nil +} + +// IDsX is like IDs, but panics if an error occurs. +func (_q *UsersQuery) IDsX(ctx context.Context) []int64 { + ids, err := _q.IDs(ctx) + if err != nil { + panic(err) + } + return ids +} + +// Count returns the count of the given query. +func (_q *UsersQuery) Count(ctx context.Context) (int, error) { + ctx = setContextOp(ctx, _q.ctx, ent.OpQueryCount) + if err := _q.prepareQuery(ctx); err != nil { + return 0, err + } + return withInterceptors[int](ctx, _q, querierCount[*UsersQuery](), _q.inters) +} + +// CountX is like Count, but panics if an error occurs. +func (_q *UsersQuery) CountX(ctx context.Context) int { + count, err := _q.Count(ctx) + if err != nil { + panic(err) + } + return count +} + +// Exist returns true if the query has elements in the graph. +func (_q *UsersQuery) Exist(ctx context.Context) (bool, error) { + ctx = setContextOp(ctx, _q.ctx, ent.OpQueryExist) + switch _, err := _q.FirstID(ctx); { + case IsNotFound(err): + return false, nil + case err != nil: + return false, fmt.Errorf("models: check existence: %w", err) + default: + return true, nil + } +} + +// ExistX is like Exist, but panics if an error occurs. +func (_q *UsersQuery) ExistX(ctx context.Context) bool { + exist, err := _q.Exist(ctx) + if err != nil { + panic(err) + } + return exist +} + +// Clone returns a duplicate of the UsersQuery builder, including all associated steps. It can be +// used to prepare common query builders and use them differently after the clone is made. +func (_q *UsersQuery) Clone() *UsersQuery { + if _q == nil { + return nil + } + return &UsersQuery{ + config: _q.config, + ctx: _q.ctx.Clone(), + order: append([]users.OrderOption{}, _q.order...), + inters: append([]Interceptor{}, _q.inters...), + predicates: append([]predicate.Users{}, _q.predicates...), + // clone intermediate query. + sql: _q.sql.Clone(), + path: _q.path, + } +} + +// GroupBy is used to group vertices by one or more fields/columns. +// It is often used with aggregate functions, like: count, max, mean, min, sum. +// +// Example: +// +// var v []struct { +// Username string `json:"username,omitempty"` +// Count int `json:"count,omitempty"` +// } +// +// client.Users.Query(). +// GroupBy(users.FieldUsername). +// Aggregate(models.Count()). +// Scan(ctx, &v) +func (_q *UsersQuery) GroupBy(field string, fields ...string) *UsersGroupBy { + _q.ctx.Fields = append([]string{field}, fields...) + grbuild := &UsersGroupBy{build: _q} + grbuild.flds = &_q.ctx.Fields + grbuild.label = users.Label + grbuild.scan = grbuild.Scan + return grbuild +} + +// Select allows the selection one or more fields/columns for the given query, +// instead of selecting all fields in the entity. +// +// Example: +// +// var v []struct { +// Username string `json:"username,omitempty"` +// } +// +// client.Users.Query(). +// Select(users.FieldUsername). +// Scan(ctx, &v) +func (_q *UsersQuery) Select(fields ...string) *UsersSelect { + _q.ctx.Fields = append(_q.ctx.Fields, fields...) + sbuild := &UsersSelect{UsersQuery: _q} + sbuild.label = users.Label + sbuild.flds, sbuild.scan = &_q.ctx.Fields, sbuild.Scan + return sbuild +} + +// Aggregate returns a UsersSelect configured with the given aggregations. +func (_q *UsersQuery) Aggregate(fns ...AggregateFunc) *UsersSelect { + return _q.Select().Aggregate(fns...) +} + +func (_q *UsersQuery) prepareQuery(ctx context.Context) error { + for _, inter := range _q.inters { + if inter == nil { + return fmt.Errorf("models: uninitialized interceptor (forgotten import models/runtime?)") + } + if trv, ok := inter.(Traverser); ok { + if err := trv.Traverse(ctx, _q); err != nil { + return err + } + } + } + for _, f := range _q.ctx.Fields { + if !users.ValidColumn(f) { + return &ValidationError{Name: f, err: fmt.Errorf("models: invalid field %q for query", f)} + } + } + if _q.path != nil { + prev, err := _q.path(ctx) + if err != nil { + return err + } + _q.sql = prev + } + return nil +} + +func (_q *UsersQuery) sqlAll(ctx context.Context, hooks ...queryHook) ([]*Users, error) { + var ( + nodes = []*Users{} + _spec = _q.querySpec() + ) + _spec.ScanValues = func(columns []string) ([]any, error) { + return (*Users).scanValues(nil, columns) + } + _spec.Assign = func(columns []string, values []any) error { + node := &Users{config: _q.config} + nodes = append(nodes, node) + return node.assignValues(columns, values) + } + for i := range hooks { + hooks[i](ctx, _spec) + } + if err := sqlgraph.QueryNodes(ctx, _q.driver, _spec); err != nil { + return nil, err + } + if len(nodes) == 0 { + return nodes, nil + } + return nodes, nil +} + +func (_q *UsersQuery) sqlCount(ctx context.Context) (int, error) { + _spec := _q.querySpec() + _spec.Node.Columns = _q.ctx.Fields + if len(_q.ctx.Fields) > 0 { + _spec.Unique = _q.ctx.Unique != nil && *_q.ctx.Unique + } + return sqlgraph.CountNodes(ctx, _q.driver, _spec) +} + +func (_q *UsersQuery) querySpec() *sqlgraph.QuerySpec { + _spec := sqlgraph.NewQuerySpec(users.Table, users.Columns, sqlgraph.NewFieldSpec(users.FieldID, field.TypeInt64)) + _spec.From = _q.sql + if unique := _q.ctx.Unique; unique != nil { + _spec.Unique = *unique + } else if _q.path != nil { + _spec.Unique = true + } + if fields := _q.ctx.Fields; len(fields) > 0 { + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, users.FieldID) + for i := range fields { + if fields[i] != users.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, fields[i]) + } + } + } + if ps := _q.predicates; len(ps) > 0 { + _spec.Predicate = func(selector *sql.Selector) { + for i := range ps { + ps[i](selector) + } + } + } + if limit := _q.ctx.Limit; limit != nil { + _spec.Limit = *limit + } + if offset := _q.ctx.Offset; offset != nil { + _spec.Offset = *offset + } + if ps := _q.order; len(ps) > 0 { + _spec.Order = func(selector *sql.Selector) { + for i := range ps { + ps[i](selector) + } + } + } + return _spec +} + +func (_q *UsersQuery) sqlQuery(ctx context.Context) *sql.Selector { + builder := sql.Dialect(_q.driver.Dialect()) + t1 := builder.Table(users.Table) + columns := _q.ctx.Fields + if len(columns) == 0 { + columns = users.Columns + } + selector := builder.Select(t1.Columns(columns...)...).From(t1) + if _q.sql != nil { + selector = _q.sql + selector.Select(selector.Columns(columns...)...) + } + if _q.ctx.Unique != nil && *_q.ctx.Unique { + selector.Distinct() + } + for _, p := range _q.predicates { + p(selector) + } + for _, p := range _q.order { + p(selector) + } + if offset := _q.ctx.Offset; offset != nil { + // limit is mandatory for offset clause. We start + // with default value, and override it below if needed. + selector.Offset(*offset).Limit(math.MaxInt32) + } + if limit := _q.ctx.Limit; limit != nil { + selector.Limit(*limit) + } + return selector +} + +// UsersGroupBy is the group-by builder for Users entities. +type UsersGroupBy struct { + selector + build *UsersQuery +} + +// Aggregate adds the given aggregation functions to the group-by query. +func (_g *UsersGroupBy) Aggregate(fns ...AggregateFunc) *UsersGroupBy { + _g.fns = append(_g.fns, fns...) + return _g +} + +// Scan applies the selector query and scans the result into the given value. +func (_g *UsersGroupBy) Scan(ctx context.Context, v any) error { + ctx = setContextOp(ctx, _g.build.ctx, ent.OpQueryGroupBy) + if err := _g.build.prepareQuery(ctx); err != nil { + return err + } + return scanWithInterceptors[*UsersQuery, *UsersGroupBy](ctx, _g.build, _g, _g.build.inters, v) +} + +func (_g *UsersGroupBy) sqlScan(ctx context.Context, root *UsersQuery, v any) error { + selector := root.sqlQuery(ctx).Select() + aggregation := make([]string, 0, len(_g.fns)) + for _, fn := range _g.fns { + aggregation = append(aggregation, fn(selector)) + } + if len(selector.SelectedColumns()) == 0 { + columns := make([]string, 0, len(*_g.flds)+len(_g.fns)) + for _, f := range *_g.flds { + columns = append(columns, selector.C(f)) + } + columns = append(columns, aggregation...) + selector.Select(columns...) + } + selector.GroupBy(selector.Columns(*_g.flds...)...) + if err := selector.Err(); err != nil { + return err + } + rows := &sql.Rows{} + query, args := selector.Query() + if err := _g.build.driver.Query(ctx, query, args, rows); err != nil { + return err + } + defer rows.Close() + return sql.ScanSlice(rows, v) +} + +// UsersSelect is the builder for selecting fields of Users entities. +type UsersSelect struct { + *UsersQuery + selector +} + +// Aggregate adds the given aggregation functions to the selector query. +func (_s *UsersSelect) Aggregate(fns ...AggregateFunc) *UsersSelect { + _s.fns = append(_s.fns, fns...) + return _s +} + +// Scan applies the selector query and scans the result into the given value. +func (_s *UsersSelect) Scan(ctx context.Context, v any) error { + ctx = setContextOp(ctx, _s.ctx, ent.OpQuerySelect) + if err := _s.prepareQuery(ctx); err != nil { + return err + } + return scanWithInterceptors[*UsersQuery, *UsersSelect](ctx, _s.UsersQuery, _s, _s.inters, v) +} + +func (_s *UsersSelect) sqlScan(ctx context.Context, root *UsersQuery, v any) error { + selector := root.sqlQuery(ctx) + aggregation := make([]string, 0, len(_s.fns)) + for _, fn := range _s.fns { + aggregation = append(aggregation, fn(selector)) + } + switch n := len(*_s.selector.flds); { + case n == 0 && len(aggregation) > 0: + selector.Select(aggregation...) + case n != 0 && len(aggregation) > 0: + selector.AppendSelect(aggregation...) + } + rows := &sql.Rows{} + query, args := selector.Query() + if err := _s.driver.Query(ctx, query, args, rows); err != nil { + return err + } + defer rows.Close() + return sql.ScanSlice(rows, v) +} diff --git a/app/users/rpc/internal/models/users_update.go b/app/users/rpc/internal/models/users_update.go new file mode 100644 index 0000000..646118c --- /dev/null +++ b/app/users/rpc/internal/models/users_update.go @@ -0,0 +1,660 @@ +// Code generated by ent, DO NOT EDIT. + +package models + +import ( + "context" + "errors" + "fmt" + "juwan-backend/app/users/rpc/internal/models/predicate" + "juwan-backend/app/users/rpc/internal/models/schema" + "juwan-backend/app/users/rpc/internal/models/users" + "time" + + "entgo.io/ent/dialect/sql" + "entgo.io/ent/dialect/sql/sqlgraph" + "entgo.io/ent/dialect/sql/sqljson" + "entgo.io/ent/schema/field" +) + +// UsersUpdate is the builder for updating Users entities. +type UsersUpdate struct { + config + hooks []Hook + mutation *UsersMutation +} + +// Where appends a list predicates to the UsersUpdate builder. +func (_u *UsersUpdate) Where(ps ...predicate.Users) *UsersUpdate { + _u.mutation.Where(ps...) + return _u +} + +// SetUsername sets the "username" field. +func (_u *UsersUpdate) SetUsername(v string) *UsersUpdate { + _u.mutation.SetUsername(v) + return _u +} + +// SetNillableUsername sets the "username" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableUsername(v *string) *UsersUpdate { + if v != nil { + _u.SetUsername(*v) + } + return _u +} + +// SetPasswordHash sets the "password_hash" field. +func (_u *UsersUpdate) SetPasswordHash(v string) *UsersUpdate { + _u.mutation.SetPasswordHash(v) + return _u +} + +// SetNillablePasswordHash sets the "password_hash" field if the given value is not nil. +func (_u *UsersUpdate) SetNillablePasswordHash(v *string) *UsersUpdate { + if v != nil { + _u.SetPasswordHash(*v) + } + return _u +} + +// SetEmail sets the "email" field. +func (_u *UsersUpdate) SetEmail(v string) *UsersUpdate { + _u.mutation.SetEmail(v) + return _u +} + +// SetNillableEmail sets the "email" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableEmail(v *string) *UsersUpdate { + if v != nil { + _u.SetEmail(*v) + } + return _u +} + +// SetPhone sets the "phone" field. +func (_u *UsersUpdate) SetPhone(v string) *UsersUpdate { + _u.mutation.SetPhone(v) + return _u +} + +// SetNillablePhone sets the "phone" field if the given value is not nil. +func (_u *UsersUpdate) SetNillablePhone(v *string) *UsersUpdate { + if v != nil { + _u.SetPhone(*v) + } + return _u +} + +// SetNickname sets the "nickname" field. +func (_u *UsersUpdate) SetNickname(v string) *UsersUpdate { + _u.mutation.SetNickname(v) + return _u +} + +// SetNillableNickname sets the "nickname" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableNickname(v *string) *UsersUpdate { + if v != nil { + _u.SetNickname(*v) + } + return _u +} + +// SetAvatar sets the "avatar" field. +func (_u *UsersUpdate) SetAvatar(v string) *UsersUpdate { + _u.mutation.SetAvatar(v) + return _u +} + +// SetNillableAvatar sets the "avatar" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableAvatar(v *string) *UsersUpdate { + if v != nil { + _u.SetAvatar(*v) + } + return _u +} + +// SetBio sets the "bio" field. +func (_u *UsersUpdate) SetBio(v string) *UsersUpdate { + _u.mutation.SetBio(v) + return _u +} + +// SetNillableBio sets the "bio" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableBio(v *string) *UsersUpdate { + if v != nil { + _u.SetBio(*v) + } + return _u +} + +// SetCurrentRole sets the "current_role" field. +func (_u *UsersUpdate) SetCurrentRole(v string) *UsersUpdate { + _u.mutation.SetCurrentRole(v) + return _u +} + +// SetNillableCurrentRole sets the "current_role" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableCurrentRole(v *string) *UsersUpdate { + if v != nil { + _u.SetCurrentRole(*v) + } + return _u +} + +// SetVerifiedRoles sets the "verified_roles" field. +func (_u *UsersUpdate) SetVerifiedRoles(v []string) *UsersUpdate { + _u.mutation.SetVerifiedRoles(v) + return _u +} + +// AppendVerifiedRoles appends value to the "verified_roles" field. +func (_u *UsersUpdate) AppendVerifiedRoles(v []string) *UsersUpdate { + _u.mutation.AppendVerifiedRoles(v) + return _u +} + +// SetVerificationStatus sets the "verificationStatus" field. +func (_u *UsersUpdate) SetVerificationStatus(v schema.VerificationStatusStruct) *UsersUpdate { + _u.mutation.SetVerificationStatus(v) + return _u +} + +// SetNillableVerificationStatus sets the "verificationStatus" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableVerificationStatus(v *schema.VerificationStatusStruct) *UsersUpdate { + if v != nil { + _u.SetVerificationStatus(*v) + } + return _u +} + +// SetIsAdmin sets the "is_admin" field. +func (_u *UsersUpdate) SetIsAdmin(v bool) *UsersUpdate { + _u.mutation.SetIsAdmin(v) + return _u +} + +// SetNillableIsAdmin sets the "is_admin" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableIsAdmin(v *bool) *UsersUpdate { + if v != nil { + _u.SetIsAdmin(*v) + } + return _u +} + +// SetCreatedAt sets the "created_at" field. +func (_u *UsersUpdate) SetCreatedAt(v time.Time) *UsersUpdate { + _u.mutation.SetCreatedAt(v) + return _u +} + +// SetNillableCreatedAt sets the "created_at" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableCreatedAt(v *time.Time) *UsersUpdate { + if v != nil { + _u.SetCreatedAt(*v) + } + return _u +} + +// SetUpdatedAt sets the "updated_at" field. +func (_u *UsersUpdate) SetUpdatedAt(v time.Time) *UsersUpdate { + _u.mutation.SetUpdatedAt(v) + return _u +} + +// SetNillableUpdatedAt sets the "updated_at" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableUpdatedAt(v *time.Time) *UsersUpdate { + if v != nil { + _u.SetUpdatedAt(*v) + } + return _u +} + +// SetDeletedAt sets the "deleted_at" field. +func (_u *UsersUpdate) SetDeletedAt(v time.Time) *UsersUpdate { + _u.mutation.SetDeletedAt(v) + return _u +} + +// SetNillableDeletedAt sets the "deleted_at" field if the given value is not nil. +func (_u *UsersUpdate) SetNillableDeletedAt(v *time.Time) *UsersUpdate { + if v != nil { + _u.SetDeletedAt(*v) + } + return _u +} + +// Mutation returns the UsersMutation object of the builder. +func (_u *UsersUpdate) Mutation() *UsersMutation { + return _u.mutation +} + +// Save executes the query and returns the number of nodes affected by the update operation. +func (_u *UsersUpdate) Save(ctx context.Context) (int, error) { + return withHooks(ctx, _u.sqlSave, _u.mutation, _u.hooks) +} + +// SaveX is like Save, but panics if an error occurs. +func (_u *UsersUpdate) SaveX(ctx context.Context) int { + affected, err := _u.Save(ctx) + if err != nil { + panic(err) + } + return affected +} + +// Exec executes the query. +func (_u *UsersUpdate) Exec(ctx context.Context) error { + _, err := _u.Save(ctx) + return err +} + +// ExecX is like Exec, but panics if an error occurs. +func (_u *UsersUpdate) ExecX(ctx context.Context) { + if err := _u.Exec(ctx); err != nil { + panic(err) + } +} + +func (_u *UsersUpdate) sqlSave(ctx context.Context) (_node int, err error) { + _spec := sqlgraph.NewUpdateSpec(users.Table, users.Columns, sqlgraph.NewFieldSpec(users.FieldID, field.TypeInt64)) + if ps := _u.mutation.predicates; len(ps) > 0 { + _spec.Predicate = func(selector *sql.Selector) { + for i := range ps { + ps[i](selector) + } + } + } + if value, ok := _u.mutation.Username(); ok { + _spec.SetField(users.FieldUsername, field.TypeString, value) + } + if value, ok := _u.mutation.PasswordHash(); ok { + _spec.SetField(users.FieldPasswordHash, field.TypeString, value) + } + if value, ok := _u.mutation.Email(); ok { + _spec.SetField(users.FieldEmail, field.TypeString, value) + } + if value, ok := _u.mutation.Phone(); ok { + _spec.SetField(users.FieldPhone, field.TypeString, value) + } + if value, ok := _u.mutation.Nickname(); ok { + _spec.SetField(users.FieldNickname, field.TypeString, value) + } + if value, ok := _u.mutation.Avatar(); ok { + _spec.SetField(users.FieldAvatar, field.TypeString, value) + } + if value, ok := _u.mutation.Bio(); ok { + _spec.SetField(users.FieldBio, field.TypeString, value) + } + if value, ok := _u.mutation.CurrentRole(); ok { + _spec.SetField(users.FieldCurrentRole, field.TypeString, value) + } + if value, ok := _u.mutation.VerifiedRoles(); ok { + _spec.SetField(users.FieldVerifiedRoles, field.TypeJSON, value) + } + if value, ok := _u.mutation.AppendedVerifiedRoles(); ok { + _spec.AddModifier(func(u *sql.UpdateBuilder) { + sqljson.Append(u, users.FieldVerifiedRoles, value) + }) + } + if value, ok := _u.mutation.VerificationStatus(); ok { + _spec.SetField(users.FieldVerificationStatus, field.TypeJSON, value) + } + if value, ok := _u.mutation.IsAdmin(); ok { + _spec.SetField(users.FieldIsAdmin, field.TypeBool, value) + } + if value, ok := _u.mutation.CreatedAt(); ok { + _spec.SetField(users.FieldCreatedAt, field.TypeTime, value) + } + if value, ok := _u.mutation.UpdatedAt(); ok { + _spec.SetField(users.FieldUpdatedAt, field.TypeTime, value) + } + if value, ok := _u.mutation.DeletedAt(); ok { + _spec.SetField(users.FieldDeletedAt, field.TypeTime, value) + } + if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { + if _, ok := err.(*sqlgraph.NotFoundError); ok { + err = &NotFoundError{users.Label} + } else if sqlgraph.IsConstraintError(err) { + err = &ConstraintError{msg: err.Error(), wrap: err} + } + return 0, err + } + _u.mutation.done = true + return _node, nil +} + +// UsersUpdateOne is the builder for updating a single Users entity. +type UsersUpdateOne struct { + config + fields []string + hooks []Hook + mutation *UsersMutation +} + +// SetUsername sets the "username" field. +func (_u *UsersUpdateOne) SetUsername(v string) *UsersUpdateOne { + _u.mutation.SetUsername(v) + return _u +} + +// SetNillableUsername sets the "username" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableUsername(v *string) *UsersUpdateOne { + if v != nil { + _u.SetUsername(*v) + } + return _u +} + +// SetPasswordHash sets the "password_hash" field. +func (_u *UsersUpdateOne) SetPasswordHash(v string) *UsersUpdateOne { + _u.mutation.SetPasswordHash(v) + return _u +} + +// SetNillablePasswordHash sets the "password_hash" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillablePasswordHash(v *string) *UsersUpdateOne { + if v != nil { + _u.SetPasswordHash(*v) + } + return _u +} + +// SetEmail sets the "email" field. +func (_u *UsersUpdateOne) SetEmail(v string) *UsersUpdateOne { + _u.mutation.SetEmail(v) + return _u +} + +// SetNillableEmail sets the "email" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableEmail(v *string) *UsersUpdateOne { + if v != nil { + _u.SetEmail(*v) + } + return _u +} + +// SetPhone sets the "phone" field. +func (_u *UsersUpdateOne) SetPhone(v string) *UsersUpdateOne { + _u.mutation.SetPhone(v) + return _u +} + +// SetNillablePhone sets the "phone" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillablePhone(v *string) *UsersUpdateOne { + if v != nil { + _u.SetPhone(*v) + } + return _u +} + +// SetNickname sets the "nickname" field. +func (_u *UsersUpdateOne) SetNickname(v string) *UsersUpdateOne { + _u.mutation.SetNickname(v) + return _u +} + +// SetNillableNickname sets the "nickname" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableNickname(v *string) *UsersUpdateOne { + if v != nil { + _u.SetNickname(*v) + } + return _u +} + +// SetAvatar sets the "avatar" field. +func (_u *UsersUpdateOne) SetAvatar(v string) *UsersUpdateOne { + _u.mutation.SetAvatar(v) + return _u +} + +// SetNillableAvatar sets the "avatar" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableAvatar(v *string) *UsersUpdateOne { + if v != nil { + _u.SetAvatar(*v) + } + return _u +} + +// SetBio sets the "bio" field. +func (_u *UsersUpdateOne) SetBio(v string) *UsersUpdateOne { + _u.mutation.SetBio(v) + return _u +} + +// SetNillableBio sets the "bio" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableBio(v *string) *UsersUpdateOne { + if v != nil { + _u.SetBio(*v) + } + return _u +} + +// SetCurrentRole sets the "current_role" field. +func (_u *UsersUpdateOne) SetCurrentRole(v string) *UsersUpdateOne { + _u.mutation.SetCurrentRole(v) + return _u +} + +// SetNillableCurrentRole sets the "current_role" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableCurrentRole(v *string) *UsersUpdateOne { + if v != nil { + _u.SetCurrentRole(*v) + } + return _u +} + +// SetVerifiedRoles sets the "verified_roles" field. +func (_u *UsersUpdateOne) SetVerifiedRoles(v []string) *UsersUpdateOne { + _u.mutation.SetVerifiedRoles(v) + return _u +} + +// AppendVerifiedRoles appends value to the "verified_roles" field. +func (_u *UsersUpdateOne) AppendVerifiedRoles(v []string) *UsersUpdateOne { + _u.mutation.AppendVerifiedRoles(v) + return _u +} + +// SetVerificationStatus sets the "verificationStatus" field. +func (_u *UsersUpdateOne) SetVerificationStatus(v schema.VerificationStatusStruct) *UsersUpdateOne { + _u.mutation.SetVerificationStatus(v) + return _u +} + +// SetNillableVerificationStatus sets the "verificationStatus" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableVerificationStatus(v *schema.VerificationStatusStruct) *UsersUpdateOne { + if v != nil { + _u.SetVerificationStatus(*v) + } + return _u +} + +// SetIsAdmin sets the "is_admin" field. +func (_u *UsersUpdateOne) SetIsAdmin(v bool) *UsersUpdateOne { + _u.mutation.SetIsAdmin(v) + return _u +} + +// SetNillableIsAdmin sets the "is_admin" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableIsAdmin(v *bool) *UsersUpdateOne { + if v != nil { + _u.SetIsAdmin(*v) + } + return _u +} + +// SetCreatedAt sets the "created_at" field. +func (_u *UsersUpdateOne) SetCreatedAt(v time.Time) *UsersUpdateOne { + _u.mutation.SetCreatedAt(v) + return _u +} + +// SetNillableCreatedAt sets the "created_at" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableCreatedAt(v *time.Time) *UsersUpdateOne { + if v != nil { + _u.SetCreatedAt(*v) + } + return _u +} + +// SetUpdatedAt sets the "updated_at" field. +func (_u *UsersUpdateOne) SetUpdatedAt(v time.Time) *UsersUpdateOne { + _u.mutation.SetUpdatedAt(v) + return _u +} + +// SetNillableUpdatedAt sets the "updated_at" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableUpdatedAt(v *time.Time) *UsersUpdateOne { + if v != nil { + _u.SetUpdatedAt(*v) + } + return _u +} + +// SetDeletedAt sets the "deleted_at" field. +func (_u *UsersUpdateOne) SetDeletedAt(v time.Time) *UsersUpdateOne { + _u.mutation.SetDeletedAt(v) + return _u +} + +// SetNillableDeletedAt sets the "deleted_at" field if the given value is not nil. +func (_u *UsersUpdateOne) SetNillableDeletedAt(v *time.Time) *UsersUpdateOne { + if v != nil { + _u.SetDeletedAt(*v) + } + return _u +} + +// Mutation returns the UsersMutation object of the builder. +func (_u *UsersUpdateOne) Mutation() *UsersMutation { + return _u.mutation +} + +// Where appends a list predicates to the UsersUpdate builder. +func (_u *UsersUpdateOne) Where(ps ...predicate.Users) *UsersUpdateOne { + _u.mutation.Where(ps...) + return _u +} + +// Select allows selecting one or more fields (columns) of the returned entity. +// The default is selecting all fields defined in the entity schema. +func (_u *UsersUpdateOne) Select(field string, fields ...string) *UsersUpdateOne { + _u.fields = append([]string{field}, fields...) + return _u +} + +// Save executes the query and returns the updated Users entity. +func (_u *UsersUpdateOne) Save(ctx context.Context) (*Users, error) { + return withHooks(ctx, _u.sqlSave, _u.mutation, _u.hooks) +} + +// SaveX is like Save, but panics if an error occurs. +func (_u *UsersUpdateOne) SaveX(ctx context.Context) *Users { + node, err := _u.Save(ctx) + if err != nil { + panic(err) + } + return node +} + +// Exec executes the query on the entity. +func (_u *UsersUpdateOne) Exec(ctx context.Context) error { + _, err := _u.Save(ctx) + return err +} + +// ExecX is like Exec, but panics if an error occurs. +func (_u *UsersUpdateOne) ExecX(ctx context.Context) { + if err := _u.Exec(ctx); err != nil { + panic(err) + } +} + +func (_u *UsersUpdateOne) sqlSave(ctx context.Context) (_node *Users, err error) { + _spec := sqlgraph.NewUpdateSpec(users.Table, users.Columns, sqlgraph.NewFieldSpec(users.FieldID, field.TypeInt64)) + id, ok := _u.mutation.ID() + if !ok { + return nil, &ValidationError{Name: "id", err: errors.New(`models: missing "Users.id" for update`)} + } + _spec.Node.ID.Value = id + if fields := _u.fields; len(fields) > 0 { + _spec.Node.Columns = make([]string, 0, len(fields)) + _spec.Node.Columns = append(_spec.Node.Columns, users.FieldID) + for _, f := range fields { + if !users.ValidColumn(f) { + return nil, &ValidationError{Name: f, err: fmt.Errorf("models: invalid field %q for query", f)} + } + if f != users.FieldID { + _spec.Node.Columns = append(_spec.Node.Columns, f) + } + } + } + if ps := _u.mutation.predicates; len(ps) > 0 { + _spec.Predicate = func(selector *sql.Selector) { + for i := range ps { + ps[i](selector) + } + } + } + if value, ok := _u.mutation.Username(); ok { + _spec.SetField(users.FieldUsername, field.TypeString, value) + } + if value, ok := _u.mutation.PasswordHash(); ok { + _spec.SetField(users.FieldPasswordHash, field.TypeString, value) + } + if value, ok := _u.mutation.Email(); ok { + _spec.SetField(users.FieldEmail, field.TypeString, value) + } + if value, ok := _u.mutation.Phone(); ok { + _spec.SetField(users.FieldPhone, field.TypeString, value) + } + if value, ok := _u.mutation.Nickname(); ok { + _spec.SetField(users.FieldNickname, field.TypeString, value) + } + if value, ok := _u.mutation.Avatar(); ok { + _spec.SetField(users.FieldAvatar, field.TypeString, value) + } + if value, ok := _u.mutation.Bio(); ok { + _spec.SetField(users.FieldBio, field.TypeString, value) + } + if value, ok := _u.mutation.CurrentRole(); ok { + _spec.SetField(users.FieldCurrentRole, field.TypeString, value) + } + if value, ok := _u.mutation.VerifiedRoles(); ok { + _spec.SetField(users.FieldVerifiedRoles, field.TypeJSON, value) + } + if value, ok := _u.mutation.AppendedVerifiedRoles(); ok { + _spec.AddModifier(func(u *sql.UpdateBuilder) { + sqljson.Append(u, users.FieldVerifiedRoles, value) + }) + } + if value, ok := _u.mutation.VerificationStatus(); ok { + _spec.SetField(users.FieldVerificationStatus, field.TypeJSON, value) + } + if value, ok := _u.mutation.IsAdmin(); ok { + _spec.SetField(users.FieldIsAdmin, field.TypeBool, value) + } + if value, ok := _u.mutation.CreatedAt(); ok { + _spec.SetField(users.FieldCreatedAt, field.TypeTime, value) + } + if value, ok := _u.mutation.UpdatedAt(); ok { + _spec.SetField(users.FieldUpdatedAt, field.TypeTime, value) + } + if value, ok := _u.mutation.DeletedAt(); ok { + _spec.SetField(users.FieldDeletedAt, field.TypeTime, value) + } + _node = &Users{config: _u.config} + _spec.Assign = _node.assignValues + _spec.ScanValues = _node.scanValues + if err = sqlgraph.UpdateNode(ctx, _u.driver, _spec); err != nil { + if _, ok := err.(*sqlgraph.NotFoundError); ok { + err = &NotFoundError{users.Label} + } else if sqlgraph.IsConstraintError(err) { + err = &ConstraintError{msg: err.Error(), wrap: err} + } + return nil, err + } + _u.mutation.done = true + return _node, nil +} diff --git a/app/users/rpc/internal/server/usercenterServer.go b/app/users/rpc/internal/server/usercenterServer.go index 7c523b1..1eafc35 100644 --- a/app/users/rpc/internal/server/usercenterServer.go +++ b/app/users/rpc/internal/server/usercenterServer.go @@ -78,3 +78,8 @@ func (s *UsercenterServer) Logout(ctx context.Context, in *pb.LogoutReq) (*pb.Lo l := logic.NewLogoutLogic(ctx, s.svcCtx) return l.Logout(in) } + +func (s *UsercenterServer) ResetPassword(ctx context.Context, in *pb.ResetPasswordReq) (*pb.ResetPasswordResp, error) { + l := logic.NewResetPasswordLogic(ctx, s.svcCtx) + return l.ResetPassword(in) +} diff --git a/app/users/rpc/internal/svc/serviceContext.go b/app/users/rpc/internal/svc/serviceContext.go index 178ce9c..ea6e8ca 100644 --- a/app/users/rpc/internal/svc/serviceContext.go +++ b/app/users/rpc/internal/svc/serviceContext.go @@ -7,49 +7,60 @@ import ( "juwan-backend/app/users/rpc/internal/utils" "juwan-backend/common/redisx" "juwan-backend/common/snowflakex" + "juwan-backend/pkg/adapter" "time" + "ariga.io/entcache" + "entgo.io/ent/dialect/sql" "github.com/redis/go-redis/v9" "github.com/zeromicro/go-zero/core/logx" - "github.com/zeromicro/go-zero/core/stores/sqlx" ) type ServiceContext struct { Config config.Config - UsersModelRW models.UsersModel - UsersModelRO models.UsersModel + UsersModelRW *models.UsersClient + UsersModelRO *models.UsersClient RedisCluster *redis.ClusterClient Snowflake snowflake.SnowflakeServiceClient JwtManager *utils.JwtManager } func NewServiceContext(c config.Config) *ServiceContext { - RWDBConn := sqlx.NewSqlConn("postgres", c.DB.Master) - RODBConn := sqlx.NewSqlConn("postgres", c.DB.Slave) + + RWConn, err := sql.Open("pgx", c.DB.Master) + if err != nil { + panic(err) + } + ROConn, err := sql.Open("pgx", c.DB.Slave) + if err != nil { + panic(err) + } logx.Infof("success to connect to postgres~") // Initialize Redis Cluster client from CacheConf redisConn, err := redisx.ConnectMasterSlaveCluster(c.CacheConf, 5*time.Second) + if err != nil || redisConn == nil { + logx.Errorf("redis connect master error: %s", err) + panic(err) + } redisCluster := redisConn.Client if redisCluster != nil { - if err != nil { - logx.Errorf("failed to connect to redis cluster: %v", err) + if redisConn.HasSlave { + logx.Infof("success to connect to redis master/slave (M: %s, S: %s)", redisConn.MasterHost, redisConn.SlaveHost) } else { - if redisConn.HasSlave { - logx.Infof("success to connect to redis master/slave (M: %s, S: %s)", redisConn.MasterHost, redisConn.SlaveHost) - } else { - logx.Infof("success to connect to redis master (M: %s), slave not configured", redisConn.MasterHost) - } + logx.Infof("success to connect to redis master (M: %s), slave not configured", redisConn.MasterHost) } } // Initialize JWT Manager jwtManager := utils.NewJwtManager(redisCluster, c.Jwt.SecretKey, c.Jwt.Issuer) + RODrv := entcache.NewDriver(ROConn, entcache.TTL(time.Second*30), entcache.Levels(adapter.NewRedisCache(redisCluster))) + RWDrv := entcache.NewDriver(RWConn, entcache.TTL(time.Second*30), entcache.Levels(adapter.NewRedisCache(redisCluster))) return &ServiceContext{ Config: c, - UsersModelRW: models.NewUsersModel(RWDBConn, c.CacheConf), - UsersModelRO: models.NewUsersModel(RODBConn, c.CacheConf), + UsersModelRW: models.NewClient(models.Driver(RWDrv)).Users, + UsersModelRO: models.NewClient(models.Driver(RODrv)).Users, RedisCluster: redisCluster, JwtManager: jwtManager, Snowflake: snowflakex.NewClient(c.SnowflakeRpcConf), diff --git a/app/users/rpc/pb/users.pb.go b/app/users/rpc/pb/users.pb.go index 97b33b5..ff0d0d2 100644 --- a/app/users/rpc/pb/users.pb.go +++ b/app/users/rpc/pb/users.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v5.29.6 +// protoc v3.19.4 // source: users.proto package pb @@ -21,22 +21,27 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// --------------------------------users-------------------------------- // --------------------------------users-------------------------------- type Users struct { - state protoimpl.MessageState `protogen:"open.v1"` - UserId int64 `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"` //userId - Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` //username - Passwd string `protobuf:"bytes,3,opt,name=passwd,proto3" json:"passwd,omitempty"` //passwd - Nickname string `protobuf:"bytes,4,opt,name=nickname,proto3" json:"nickname,omitempty"` //nickname - Phone string `protobuf:"bytes,5,opt,name=phone,proto3" json:"phone,omitempty"` //phone - RoleType int64 `protobuf:"varint,6,opt,name=roleType,proto3" json:"roleType,omitempty"` //roleType - IsVerified bool `protobuf:"varint,7,opt,name=isVerified,proto3" json:"isVerified,omitempty"` //isVerified - State bool `protobuf:"varint,8,opt,name=state,proto3" json:"state,omitempty"` //state - CreatedAt int64 `protobuf:"varint,9,opt,name=createdAt,proto3" json:"createdAt,omitempty"` //createdAt - UpdatedAt int64 `protobuf:"varint,10,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` //updatedAt - DeletedAt int64 `protobuf:"varint,11,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` //deletedAt - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` //id + Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` //username + PasswordHash string `protobuf:"bytes,3,opt,name=passwordHash,proto3" json:"passwordHash,omitempty"` //passwordHash + Phone string `protobuf:"bytes,4,opt,name=phone,proto3" json:"phone,omitempty"` //phone + Email string `protobuf:"bytes,5,opt,name=email,proto3" json:"email,omitempty"` //email + Nickname string `protobuf:"bytes,6,opt,name=nickname,proto3" json:"nickname,omitempty"` //nickname + Avatar string `protobuf:"bytes,7,opt,name=avatar,proto3" json:"avatar,omitempty"` //avatar + Bio string `protobuf:"bytes,8,opt,name=bio,proto3" json:"bio,omitempty"` //bio + CurrentRole string `protobuf:"bytes,9,opt,name=currentRole,proto3" json:"currentRole,omitempty"` //currentRole + VerifiedRoles []string `protobuf:"bytes,10,rep,name=verifiedRoles,proto3" json:"verifiedRoles,omitempty"` //verifiedRoles + VerificationStatus string `protobuf:"bytes,11,opt,name=verificationStatus,proto3" json:"verificationStatus,omitempty"` //verificationStatus + IsAdmin bool `protobuf:"varint,12,opt,name=isAdmin,proto3" json:"isAdmin,omitempty"` //isAdmin + CreatedAt int64 `protobuf:"varint,13,opt,name=createdAt,proto3" json:"createdAt,omitempty"` //createdAt + UpdatedAt int64 `protobuf:"varint,14,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` //updatedAt + DeletedAt int64 `protobuf:"varint,15,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` //deletedAt + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Users) Reset() { @@ -69,9 +74,9 @@ func (*Users) Descriptor() ([]byte, []int) { return file_users_proto_rawDescGZIP(), []int{0} } -func (x *Users) GetUserId() int64 { +func (x *Users) GetId() int64 { if x != nil { - return x.UserId + return x.Id } return 0 } @@ -83,16 +88,9 @@ func (x *Users) GetUsername() string { return "" } -func (x *Users) GetPasswd() string { +func (x *Users) GetPasswordHash() string { if x != nil { - return x.Passwd - } - return "" -} - -func (x *Users) GetNickname() string { - if x != nil { - return x.Nickname + return x.PasswordHash } return "" } @@ -104,23 +102,58 @@ func (x *Users) GetPhone() string { return "" } -func (x *Users) GetRoleType() int64 { +func (x *Users) GetEmail() string { if x != nil { - return x.RoleType + return x.Email } - return 0 + return "" } -func (x *Users) GetIsVerified() bool { +func (x *Users) GetNickname() string { if x != nil { - return x.IsVerified + return x.Nickname } - return false + return "" } -func (x *Users) GetState() bool { +func (x *Users) GetAvatar() string { if x != nil { - return x.State + return x.Avatar + } + return "" +} + +func (x *Users) GetBio() string { + if x != nil { + return x.Bio + } + return "" +} + +func (x *Users) GetCurrentRole() string { + if x != nil { + return x.CurrentRole + } + return "" +} + +func (x *Users) GetVerifiedRoles() []string { + if x != nil { + return x.VerifiedRoles + } + return nil +} + +func (x *Users) GetVerificationStatus() string { + if x != nil { + return x.VerificationStatus + } + return "" +} + +func (x *Users) GetIsAdmin() bool { + if x != nil { + return x.IsAdmin } return false } @@ -147,20 +180,23 @@ func (x *Users) GetDeletedAt() int64 { } type AddUsersReq struct { - state protoimpl.MessageState `protogen:"open.v1"` - UserId int64 `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"` //userId - Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` //username - Passwd string `protobuf:"bytes,3,opt,name=passwd,proto3" json:"passwd,omitempty"` //passwd - Nickname string `protobuf:"bytes,4,opt,name=nickname,proto3" json:"nickname,omitempty"` //nickname - Phone string `protobuf:"bytes,5,opt,name=phone,proto3" json:"phone,omitempty"` //phone - RoleType int64 `protobuf:"varint,6,opt,name=roleType,proto3" json:"roleType,omitempty"` //roleType - IsVerified bool `protobuf:"varint,7,opt,name=isVerified,proto3" json:"isVerified,omitempty"` //isVerified - State bool `protobuf:"varint,8,opt,name=state,proto3" json:"state,omitempty"` //state - CreatedAt int64 `protobuf:"varint,9,opt,name=createdAt,proto3" json:"createdAt,omitempty"` //createdAt - UpdatedAt int64 `protobuf:"varint,10,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` //updatedAt - DeletedAt int64 `protobuf:"varint,11,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` //deletedAt - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` //username + PasswordHash string `protobuf:"bytes,2,opt,name=passwordHash,proto3" json:"passwordHash,omitempty"` //passwordHash + Phone string `protobuf:"bytes,3,opt,name=phone,proto3" json:"phone,omitempty"` //phone + Email string `protobuf:"bytes,4,opt,name=email,proto3" json:"email,omitempty"` //email + Nickname string `protobuf:"bytes,5,opt,name=nickname,proto3" json:"nickname,omitempty"` //nickname + Avatar string `protobuf:"bytes,6,opt,name=avatar,proto3" json:"avatar,omitempty"` //avatar + Bio string `protobuf:"bytes,7,opt,name=bio,proto3" json:"bio,omitempty"` //bio + CurrentRole string `protobuf:"bytes,8,opt,name=currentRole,proto3" json:"currentRole,omitempty"` //currentRole + VerifiedRoles []string `protobuf:"bytes,9,rep,name=verifiedRoles,proto3" json:"verifiedRoles,omitempty"` //verifiedRoles + VerificationStatus string `protobuf:"bytes,10,opt,name=verificationStatus,proto3" json:"verificationStatus,omitempty"` //verificationStatus + IsAdmin bool `protobuf:"varint,11,opt,name=isAdmin,proto3" json:"isAdmin,omitempty"` //isAdmin + CreatedAt int64 `protobuf:"varint,12,opt,name=createdAt,proto3" json:"createdAt,omitempty"` //createdAt + UpdatedAt int64 `protobuf:"varint,13,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` //updatedAt + DeletedAt int64 `protobuf:"varint,14,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` //deletedAt + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *AddUsersReq) Reset() { @@ -193,13 +229,6 @@ func (*AddUsersReq) Descriptor() ([]byte, []int) { return file_users_proto_rawDescGZIP(), []int{1} } -func (x *AddUsersReq) GetUserId() int64 { - if x != nil { - return x.UserId - } - return 0 -} - func (x *AddUsersReq) GetUsername() string { if x != nil { return x.Username @@ -207,16 +236,9 @@ func (x *AddUsersReq) GetUsername() string { return "" } -func (x *AddUsersReq) GetPasswd() string { +func (x *AddUsersReq) GetPasswordHash() string { if x != nil { - return x.Passwd - } - return "" -} - -func (x *AddUsersReq) GetNickname() string { - if x != nil { - return x.Nickname + return x.PasswordHash } return "" } @@ -228,23 +250,58 @@ func (x *AddUsersReq) GetPhone() string { return "" } -func (x *AddUsersReq) GetRoleType() int64 { +func (x *AddUsersReq) GetEmail() string { if x != nil { - return x.RoleType + return x.Email } - return 0 + return "" } -func (x *AddUsersReq) GetIsVerified() bool { +func (x *AddUsersReq) GetNickname() string { if x != nil { - return x.IsVerified + return x.Nickname } - return false + return "" } -func (x *AddUsersReq) GetState() bool { +func (x *AddUsersReq) GetAvatar() string { if x != nil { - return x.State + return x.Avatar + } + return "" +} + +func (x *AddUsersReq) GetBio() string { + if x != nil { + return x.Bio + } + return "" +} + +func (x *AddUsersReq) GetCurrentRole() string { + if x != nil { + return x.CurrentRole + } + return "" +} + +func (x *AddUsersReq) GetVerifiedRoles() []string { + if x != nil { + return x.VerifiedRoles + } + return nil +} + +func (x *AddUsersReq) GetVerificationStatus() string { + if x != nil { + return x.VerificationStatus + } + return "" +} + +func (x *AddUsersReq) GetIsAdmin() bool { + if x != nil { + return x.IsAdmin } return false } @@ -307,20 +364,24 @@ func (*AddUsersResp) Descriptor() ([]byte, []int) { } type UpdateUsersReq struct { - state protoimpl.MessageState `protogen:"open.v1"` - UserId int64 `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"` //userId - Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` //username - Passwd string `protobuf:"bytes,3,opt,name=passwd,proto3" json:"passwd,omitempty"` //passwd - Nickname string `protobuf:"bytes,4,opt,name=nickname,proto3" json:"nickname,omitempty"` //nickname - Phone string `protobuf:"bytes,5,opt,name=phone,proto3" json:"phone,omitempty"` //phone - RoleType int64 `protobuf:"varint,6,opt,name=roleType,proto3" json:"roleType,omitempty"` //roleType - IsVerified bool `protobuf:"varint,7,opt,name=isVerified,proto3" json:"isVerified,omitempty"` //isVerified - State bool `protobuf:"varint,8,opt,name=state,proto3" json:"state,omitempty"` //state - CreatedAt int64 `protobuf:"varint,9,opt,name=createdAt,proto3" json:"createdAt,omitempty"` //createdAt - UpdatedAt int64 `protobuf:"varint,10,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` //updatedAt - DeletedAt int64 `protobuf:"varint,11,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` //deletedAt - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` //id + Username *string `protobuf:"bytes,2,opt,name=username,proto3,oneof" json:"username,omitempty"` //username + PasswordHash *string `protobuf:"bytes,3,opt,name=passwordHash,proto3,oneof" json:"passwordHash,omitempty"` //passwordHash + Phone *string `protobuf:"bytes,4,opt,name=phone,proto3,oneof" json:"phone,omitempty"` //phone + Email *string `protobuf:"bytes,5,opt,name=email,proto3,oneof" json:"email,omitempty"` //email + Nickname *string `protobuf:"bytes,6,opt,name=nickname,proto3,oneof" json:"nickname,omitempty"` //nickname + Avatar *string `protobuf:"bytes,7,opt,name=avatar,proto3,oneof" json:"avatar,omitempty"` //avatar + Bio *string `protobuf:"bytes,8,opt,name=bio,proto3,oneof" json:"bio,omitempty"` //bio + CurrentRole *string `protobuf:"bytes,9,opt,name=currentRole,proto3,oneof" json:"currentRole,omitempty"` //currentRole + VerifiedRoles []string `protobuf:"bytes,10,rep,name=verifiedRoles,proto3" json:"verifiedRoles,omitempty"` //verifiedRoles + VerificationStatus *string `protobuf:"bytes,11,opt,name=verificationStatus,proto3,oneof" json:"verificationStatus,omitempty"` //verificationStatus + IsAdmin *bool `protobuf:"varint,12,opt,name=isAdmin,proto3,oneof" json:"isAdmin,omitempty"` //isAdmin + CreatedAt *int64 `protobuf:"varint,13,opt,name=createdAt,proto3,oneof" json:"createdAt,omitempty"` //createdAt + UpdatedAt *int64 `protobuf:"varint,14,opt,name=updatedAt,proto3,oneof" json:"updatedAt,omitempty"` //updatedAt + DeletedAt *int64 `protobuf:"varint,15,opt,name=deletedAt,proto3,oneof" json:"deletedAt,omitempty"` //deletedAt + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *UpdateUsersReq) Reset() { @@ -353,79 +414,107 @@ func (*UpdateUsersReq) Descriptor() ([]byte, []int) { return file_users_proto_rawDescGZIP(), []int{3} } -func (x *UpdateUsersReq) GetUserId() int64 { +func (x *UpdateUsersReq) GetId() int64 { if x != nil { - return x.UserId + return x.Id } return 0 } func (x *UpdateUsersReq) GetUsername() string { - if x != nil { - return x.Username + if x != nil && x.Username != nil { + return *x.Username } return "" } -func (x *UpdateUsersReq) GetPasswd() string { - if x != nil { - return x.Passwd - } - return "" -} - -func (x *UpdateUsersReq) GetNickname() string { - if x != nil { - return x.Nickname +func (x *UpdateUsersReq) GetPasswordHash() string { + if x != nil && x.PasswordHash != nil { + return *x.PasswordHash } return "" } func (x *UpdateUsersReq) GetPhone() string { - if x != nil { - return x.Phone + if x != nil && x.Phone != nil { + return *x.Phone } return "" } -func (x *UpdateUsersReq) GetRoleType() int64 { - if x != nil { - return x.RoleType +func (x *UpdateUsersReq) GetEmail() string { + if x != nil && x.Email != nil { + return *x.Email } - return 0 + return "" } -func (x *UpdateUsersReq) GetIsVerified() bool { - if x != nil { - return x.IsVerified +func (x *UpdateUsersReq) GetNickname() string { + if x != nil && x.Nickname != nil { + return *x.Nickname } - return false + return "" } -func (x *UpdateUsersReq) GetState() bool { +func (x *UpdateUsersReq) GetAvatar() string { + if x != nil && x.Avatar != nil { + return *x.Avatar + } + return "" +} + +func (x *UpdateUsersReq) GetBio() string { + if x != nil && x.Bio != nil { + return *x.Bio + } + return "" +} + +func (x *UpdateUsersReq) GetCurrentRole() string { + if x != nil && x.CurrentRole != nil { + return *x.CurrentRole + } + return "" +} + +func (x *UpdateUsersReq) GetVerifiedRoles() []string { if x != nil { - return x.State + return x.VerifiedRoles + } + return nil +} + +func (x *UpdateUsersReq) GetVerificationStatus() string { + if x != nil && x.VerificationStatus != nil { + return *x.VerificationStatus + } + return "" +} + +func (x *UpdateUsersReq) GetIsAdmin() bool { + if x != nil && x.IsAdmin != nil { + return *x.IsAdmin } return false } func (x *UpdateUsersReq) GetCreatedAt() int64 { - if x != nil { - return x.CreatedAt + if x != nil && x.CreatedAt != nil { + return *x.CreatedAt } return 0 } func (x *UpdateUsersReq) GetUpdatedAt() int64 { - if x != nil { - return x.UpdatedAt + if x != nil && x.UpdatedAt != nil { + return *x.UpdatedAt } return 0 } func (x *UpdateUsersReq) GetDeletedAt() int64 { - if x != nil { - return x.DeletedAt + if x != nil && x.DeletedAt != nil { + return *x.DeletedAt } return 0 } @@ -635,22 +724,26 @@ func (x *GetUsersByIdResp) GetUsers() *Users { } type SearchUsersReq struct { - state protoimpl.MessageState `protogen:"open.v1"` - Page int64 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"` //page - Limit int64 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` //limit - UserId int64 `protobuf:"varint,3,opt,name=userId,proto3" json:"userId,omitempty"` //userId - Username string `protobuf:"bytes,4,opt,name=username,proto3" json:"username,omitempty"` //username - Passwd string `protobuf:"bytes,5,opt,name=passwd,proto3" json:"passwd,omitempty"` //passwd - Nickname string `protobuf:"bytes,6,opt,name=nickname,proto3" json:"nickname,omitempty"` //nickname - Phone string `protobuf:"bytes,7,opt,name=phone,proto3" json:"phone,omitempty"` //phone - RoleType int64 `protobuf:"varint,8,opt,name=roleType,proto3" json:"roleType,omitempty"` //roleType - IsVerified bool `protobuf:"varint,9,opt,name=isVerified,proto3" json:"isVerified,omitempty"` //isVerified - State bool `protobuf:"varint,10,opt,name=state,proto3" json:"state,omitempty"` //state - CreatedAt int64 `protobuf:"varint,11,opt,name=createdAt,proto3" json:"createdAt,omitempty"` //createdAt - UpdatedAt int64 `protobuf:"varint,12,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"` //updatedAt - DeletedAt int64 `protobuf:"varint,13,opt,name=deletedAt,proto3" json:"deletedAt,omitempty"` //deletedAt - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Page *int64 `protobuf:"varint,1,opt,name=page,proto3,oneof" json:"page,omitempty"` //page + Limit *int64 `protobuf:"varint,2,opt,name=limit,proto3,oneof" json:"limit,omitempty"` //limit + Id *int64 `protobuf:"varint,3,opt,name=id,proto3,oneof" json:"id,omitempty"` //id + Username *string `protobuf:"bytes,4,opt,name=username,proto3,oneof" json:"username,omitempty"` //username + PasswordHash *string `protobuf:"bytes,5,opt,name=passwordHash,proto3,oneof" json:"passwordHash,omitempty"` //passwordHash + Phone *string `protobuf:"bytes,6,opt,name=phone,proto3,oneof" json:"phone,omitempty"` //phone + Email *string `protobuf:"bytes,7,opt,name=email,proto3,oneof" json:"email,omitempty"` //email + Nickname *string `protobuf:"bytes,8,opt,name=nickname,proto3,oneof" json:"nickname,omitempty"` //nickname + Avatar *string `protobuf:"bytes,9,opt,name=avatar,proto3,oneof" json:"avatar,omitempty"` //avatar + Bio *string `protobuf:"bytes,10,opt,name=bio,proto3,oneof" json:"bio,omitempty"` //bio + CurrentRole *string `protobuf:"bytes,11,opt,name=currentRole,proto3,oneof" json:"currentRole,omitempty"` //currentRole + VerifiedRoles []string `protobuf:"bytes,12,rep,name=verifiedRoles,proto3" json:"verifiedRoles,omitempty"` //verifiedRoles + VerificationStatus *string `protobuf:"bytes,13,opt,name=verificationStatus,proto3,oneof" json:"verificationStatus,omitempty"` //verificationStatus + IsAdmin *bool `protobuf:"varint,14,opt,name=isAdmin,proto3,oneof" json:"isAdmin,omitempty"` //isAdmin + CreatedAt *int64 `protobuf:"varint,15,opt,name=createdAt,proto3,oneof" json:"createdAt,omitempty"` //createdAt + UpdatedAt *int64 `protobuf:"varint,16,opt,name=updatedAt,proto3,oneof" json:"updatedAt,omitempty"` //updatedAt + DeletedAt *int64 `protobuf:"varint,17,opt,name=deletedAt,proto3,oneof" json:"deletedAt,omitempty"` //deletedAt + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *SearchUsersReq) Reset() { @@ -684,92 +777,120 @@ func (*SearchUsersReq) Descriptor() ([]byte, []int) { } func (x *SearchUsersReq) GetPage() int64 { - if x != nil { - return x.Page + if x != nil && x.Page != nil { + return *x.Page } return 0 } func (x *SearchUsersReq) GetLimit() int64 { - if x != nil { - return x.Limit + if x != nil && x.Limit != nil { + return *x.Limit } return 0 } -func (x *SearchUsersReq) GetUserId() int64 { - if x != nil { - return x.UserId +func (x *SearchUsersReq) GetId() int64 { + if x != nil && x.Id != nil { + return *x.Id } return 0 } func (x *SearchUsersReq) GetUsername() string { - if x != nil { - return x.Username + if x != nil && x.Username != nil { + return *x.Username } return "" } -func (x *SearchUsersReq) GetPasswd() string { - if x != nil { - return x.Passwd - } - return "" -} - -func (x *SearchUsersReq) GetNickname() string { - if x != nil { - return x.Nickname +func (x *SearchUsersReq) GetPasswordHash() string { + if x != nil && x.PasswordHash != nil { + return *x.PasswordHash } return "" } func (x *SearchUsersReq) GetPhone() string { - if x != nil { - return x.Phone + if x != nil && x.Phone != nil { + return *x.Phone } return "" } -func (x *SearchUsersReq) GetRoleType() int64 { - if x != nil { - return x.RoleType +func (x *SearchUsersReq) GetEmail() string { + if x != nil && x.Email != nil { + return *x.Email } - return 0 + return "" } -func (x *SearchUsersReq) GetIsVerified() bool { - if x != nil { - return x.IsVerified +func (x *SearchUsersReq) GetNickname() string { + if x != nil && x.Nickname != nil { + return *x.Nickname } - return false + return "" } -func (x *SearchUsersReq) GetState() bool { +func (x *SearchUsersReq) GetAvatar() string { + if x != nil && x.Avatar != nil { + return *x.Avatar + } + return "" +} + +func (x *SearchUsersReq) GetBio() string { + if x != nil && x.Bio != nil { + return *x.Bio + } + return "" +} + +func (x *SearchUsersReq) GetCurrentRole() string { + if x != nil && x.CurrentRole != nil { + return *x.CurrentRole + } + return "" +} + +func (x *SearchUsersReq) GetVerifiedRoles() []string { if x != nil { - return x.State + return x.VerifiedRoles + } + return nil +} + +func (x *SearchUsersReq) GetVerificationStatus() string { + if x != nil && x.VerificationStatus != nil { + return *x.VerificationStatus + } + return "" +} + +func (x *SearchUsersReq) GetIsAdmin() bool { + if x != nil && x.IsAdmin != nil { + return *x.IsAdmin } return false } func (x *SearchUsersReq) GetCreatedAt() int64 { - if x != nil { - return x.CreatedAt + if x != nil && x.CreatedAt != nil { + return *x.CreatedAt } return 0 } func (x *SearchUsersReq) GetUpdatedAt() int64 { - if x != nil { - return x.UpdatedAt + if x != nil && x.UpdatedAt != nil { + return *x.UpdatedAt } return 0 } func (x *SearchUsersReq) GetDeletedAt() int64 { - if x != nil { - return x.DeletedAt + if x != nil && x.DeletedAt != nil { + return *x.DeletedAt } return 0 } @@ -1083,7 +1204,7 @@ type ValidateTokenResp struct { Valid bool `protobuf:"varint,1,opt,name=valid,proto3" json:"valid,omitempty"` // token 是否有效（不在黑名单中） Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` // 验证失败原因 UserId int64 `protobuf:"varint,3,opt,name=userId,proto3" json:"userId,omitempty"` // 用户ID - RoleType int64 `protobuf:"varint,4,opt,name=roleType,proto3" json:"roleType,omitempty"` // 用户角色 + RoleType string `protobuf:"varint,4,opt,name=roleType,proto3" json:"roleType,omitempty"` // 用户角色 unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -1139,11 +1260,11 @@ func (x *ValidateTokenResp) GetUserId() int64 { return 0 } -func (x *ValidateTokenResp) GetRoleType() int64 { +func (x *ValidateTokenResp) GetRoleType() string { if x != nil { return x.RoleType } - return 0 + return "" } type CheckPermissionReq struct { @@ -1466,57 +1587,184 @@ func (*LogoutResp) Descriptor() ([]byte, []int) { return file_users_proto_rawDescGZIP(), []int{22} } +type ResetPasswordReq struct { + state protoimpl.MessageState `protogen:"open.v1"` + NewPassword string `protobuf:"bytes,1,opt,name=newPassword,proto3" json:"newPassword,omitempty"` + Email string `protobuf:"bytes,2,opt,name=email,proto3" json:"email,omitempty"` + RequestId string `protobuf:"bytes,3,opt,name=requestId,proto3" json:"requestId,omitempty"` + Vcode string `protobuf:"bytes,4,opt,name=vcode,proto3" json:"vcode,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ResetPasswordReq) Reset() { + *x = ResetPasswordReq{} + mi := &file_users_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ResetPasswordReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ResetPasswordReq) ProtoMessage() {} + +func (x *ResetPasswordReq) ProtoReflect() protoreflect.Message { + mi := &file_users_proto_msgTypes[23] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ResetPasswordReq.ProtoReflect.Descriptor instead. +func (*ResetPasswordReq) Descriptor() ([]byte, []int) { + return file_users_proto_rawDescGZIP(), []int{23} +} + +func (x *ResetPasswordReq) GetNewPassword() string { + if x != nil { + return x.NewPassword + } + return "" +} + +func (x *ResetPasswordReq) GetEmail() string { + if x != nil { + return x.Email + } + return "" +} + +func (x *ResetPasswordReq) GetRequestId() string { + if x != nil { + return x.RequestId + } + return "" +} + +func (x *ResetPasswordReq) GetVcode() string { + if x != nil { + return x.Vcode + } + return "" +} + +type ResetPasswordResp struct { + state protoimpl.MessageState `protogen:"open.v1"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ResetPasswordResp) Reset() { + *x = ResetPasswordResp{} + mi := &file_users_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ResetPasswordResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ResetPasswordResp) ProtoMessage() {} + +func (x *ResetPasswordResp) ProtoReflect() protoreflect.Message { + mi := &file_users_proto_msgTypes[24] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ResetPasswordResp.ProtoReflect.Descriptor instead. +func (*ResetPasswordResp) Descriptor() ([]byte, []int) { + return file_users_proto_rawDescGZIP(), []int{24} +} + var File_users_proto protoreflect.FileDescriptor const file_users_proto_rawDesc = "" + "\n" + - "\vusers.proto\x12\x02pb\"\xb1\x02\n" + - "\x05Users\x12\x16\n" + - "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" + - "\busername\x18\x02 \x01(\tR\busername\x12\x16\n" + - "\x06passwd\x18\x03 \x01(\tR\x06passwd\x12\x1a\n" + - "\bnickname\x18\x04 \x01(\tR\bnickname\x12\x14\n" + - "\x05phone\x18\x05 \x01(\tR\x05phone\x12\x1a\n" + - "\broleType\x18\x06 \x01(\x03R\broleType\x12\x1e\n" + + "\vusers.proto\x12\x02pb\"\xb5\x03\n" + + "\x05Users\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + + "\busername\x18\x02 \x01(\tR\busername\x12\"\n" + + "\fpasswordHash\x18\x03 \x01(\tR\fpasswordHash\x12\x14\n" + + "\x05phone\x18\x04 \x01(\tR\x05phone\x12\x14\n" + + "\x05email\x18\x05 \x01(\tR\x05email\x12\x1a\n" + + "\bnickname\x18\x06 \x01(\tR\bnickname\x12\x16\n" + + "\x06avatar\x18\a \x01(\tR\x06avatar\x12\x10\n" + + "\x03bio\x18\b \x01(\tR\x03bio\x12 \n" + + "\vcurrentRole\x18\t \x01(\tR\vcurrentRole\x12$\n" + + "\rverifiedRoles\x18\n" + + " \x03(\tR\rverifiedRoles\x12.\n" + + "\x12verificationStatus\x18\v \x01(\tR\x12verificationStatus\x12\x18\n" + + "\aisAdmin\x18\f \x01(\bR\aisAdmin\x12\x1c\n" + + "\tcreatedAt\x18\r \x01(\x03R\tcreatedAt\x12\x1c\n" + + "\tupdatedAt\x18\x0e \x01(\x03R\tupdatedAt\x12\x1c\n" + + "\tdeletedAt\x18\x0f \x01(\x03R\tdeletedAt\"\xab\x03\n" + + "\vAddUsersReq\x12\x1a\n" + + "\busername\x18\x01 \x01(\tR\busername\x12\"\n" + + "\fpasswordHash\x18\x02 \x01(\tR\fpasswordHash\x12\x14\n" + + "\x05phone\x18\x03 \x01(\tR\x05phone\x12\x14\n" + + "\x05email\x18\x04 \x01(\tR\x05email\x12\x1a\n" + + "\bnickname\x18\x05 \x01(\tR\bnickname\x12\x16\n" + + "\x06avatar\x18\x06 \x01(\tR\x06avatar\x12\x10\n" + + "\x03bio\x18\a \x01(\tR\x03bio\x12 \n" + + "\vcurrentRole\x18\b \x01(\tR\vcurrentRole\x12$\n" + + "\rverifiedRoles\x18\t \x03(\tR\rverifiedRoles\x12.\n" + + "\x12verificationStatus\x18\n" + + " \x01(\tR\x12verificationStatus\x12\x18\n" + + "\aisAdmin\x18\v \x01(\bR\aisAdmin\x12\x1c\n" + + "\tcreatedAt\x18\f \x01(\x03R\tcreatedAt\x12\x1c\n" + + "\tupdatedAt\x18\r \x01(\x03R\tupdatedAt\x12\x1c\n" + + "\tdeletedAt\x18\x0e \x01(\x03R\tdeletedAt\"\x0e\n" + + "\fAddUsersResp\"\xae\x05\n" + + "\x0eUpdateUsersReq\x12\x0e\n" + + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1f\n" + + "\busername\x18\x02 \x01(\tH\x00R\busername\x88\x01\x01\x12'\n" + + "\fpasswordHash\x18\x03 \x01(\tH\x01R\fpasswordHash\x88\x01\x01\x12\x19\n" + + "\x05phone\x18\x04 \x01(\tH\x02R\x05phone\x88\x01\x01\x12\x19\n" + + "\x05email\x18\x05 \x01(\tH\x03R\x05email\x88\x01\x01\x12\x1f\n" + + "\bnickname\x18\x06 \x01(\tH\x04R\bnickname\x88\x01\x01\x12\x1b\n" + + "\x06avatar\x18\a \x01(\tH\x05R\x06avatar\x88\x01\x01\x12\x15\n" + + "\x03bio\x18\b \x01(\tH\x06R\x03bio\x88\x01\x01\x12%\n" + + "\vcurrentRole\x18\t \x01(\tH\aR\vcurrentRole\x88\x01\x01\x12$\n" + + "\rverifiedRoles\x18\n" + + " \x03(\tR\rverifiedRoles\x123\n" + + "\x12verificationStatus\x18\v \x01(\tH\bR\x12verificationStatus\x88\x01\x01\x12\x1d\n" + + "\aisAdmin\x18\f \x01(\bH\tR\aisAdmin\x88\x01\x01\x12!\n" + + "\tcreatedAt\x18\r \x01(\x03H\n" + + "R\tcreatedAt\x88\x01\x01\x12!\n" + + "\tupdatedAt\x18\x0e \x01(\x03H\vR\tupdatedAt\x88\x01\x01\x12!\n" + + "\tdeletedAt\x18\x0f \x01(\x03H\fR\tdeletedAt\x88\x01\x01B\v\n" + + "\t_usernameB\x0f\n" + + "\r_passwordHashB\b\n" + + "\x06_phoneB\b\n" + + "\x06_emailB\v\n" + + "\t_nicknameB\t\n" + + "\a_avatarB\x06\n" + + "\x04_bioB\x0e\n" + + "\f_currentRoleB\x15\n" + + "\x13_verificationStatusB\n" + "\n" + - "isVerified\x18\a \x01(\bR\n" + - "isVerified\x12\x14\n" + - "\x05state\x18\b \x01(\bR\x05state\x12\x1c\n" + - "\tcreatedAt\x18\t \x01(\x03R\tcreatedAt\x12\x1c\n" + - "\tupdatedAt\x18\n" + - " \x01(\x03R\tupdatedAt\x12\x1c\n" + - "\tdeletedAt\x18\v \x01(\x03R\tdeletedAt\"\xb7\x02\n" + - "\vAddUsersReq\x12\x16\n" + - "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" + - "\busername\x18\x02 \x01(\tR\busername\x12\x16\n" + - "\x06passwd\x18\x03 \x01(\tR\x06passwd\x12\x1a\n" + - "\bnickname\x18\x04 \x01(\tR\bnickname\x12\x14\n" + - "\x05phone\x18\x05 \x01(\tR\x05phone\x12\x1a\n" + - "\broleType\x18\x06 \x01(\x03R\broleType\x12\x1e\n" + + "\b_isAdminB\f\n" + "\n" + - "isVerified\x18\a \x01(\bR\n" + - "isVerified\x12\x14\n" + - "\x05state\x18\b \x01(\bR\x05state\x12\x1c\n" + - "\tcreatedAt\x18\t \x01(\x03R\tcreatedAt\x12\x1c\n" + - "\tupdatedAt\x18\n" + - " \x01(\x03R\tupdatedAt\x12\x1c\n" + - "\tdeletedAt\x18\v \x01(\x03R\tdeletedAt\"\x0e\n" + - "\fAddUsersResp\"\xba\x02\n" + - "\x0eUpdateUsersReq\x12\x16\n" + - "\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" + - "\busername\x18\x02 \x01(\tR\busername\x12\x16\n" + - "\x06passwd\x18\x03 \x01(\tR\x06passwd\x12\x1a\n" + - "\bnickname\x18\x04 \x01(\tR\bnickname\x12\x14\n" + - "\x05phone\x18\x05 \x01(\tR\x05phone\x12\x1a\n" + - "\broleType\x18\x06 \x01(\x03R\broleType\x12\x1e\n" + + "_createdAtB\f\n" + "\n" + - "isVerified\x18\a \x01(\bR\n" + - "isVerified\x12\x14\n" + - "\x05state\x18\b \x01(\bR\x05state\x12\x1c\n" + - "\tcreatedAt\x18\t \x01(\x03R\tcreatedAt\x12\x1c\n" + - "\tupdatedAt\x18\n" + - " \x01(\x03R\tupdatedAt\x12\x1c\n" + - "\tdeletedAt\x18\v \x01(\x03R\tdeletedAt\"\x11\n" + + "_updatedAtB\f\n" + + "\n" + + "_deletedAt\"\x11\n" + "\x0fUpdateUsersResp\"\x1d\n" + "\vDelUsersReq\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\"\x0e\n" + @@ -1524,24 +1772,47 @@ const file_users_proto_rawDesc = "" + "\x0fGetUsersByIdReq\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\"3\n" + "\x10GetUsersByIdResp\x12\x1f\n" + - "\x05users\x18\x01 \x01(\v2\t.pb.UsersR\x05users\"\xe4\x02\n" + - "\x0eSearchUsersReq\x12\x12\n" + - "\x04page\x18\x01 \x01(\x03R\x04page\x12\x14\n" + - "\x05limit\x18\x02 \x01(\x03R\x05limit\x12\x16\n" + - "\x06userId\x18\x03 \x01(\x03R\x06userId\x12\x1a\n" + - "\busername\x18\x04 \x01(\tR\busername\x12\x16\n" + - "\x06passwd\x18\x05 \x01(\tR\x06passwd\x12\x1a\n" + - "\bnickname\x18\x06 \x01(\tR\bnickname\x12\x14\n" + - "\x05phone\x18\a \x01(\tR\x05phone\x12\x1a\n" + - "\broleType\x18\b \x01(\x03R\broleType\x12\x1e\n" + + "\x05users\x18\x01 \x01(\v2\t.pb.UsersR\x05users\"\x81\x06\n" + + "\x0eSearchUsersReq\x12\x17\n" + + "\x04page\x18\x01 \x01(\x03H\x00R\x04page\x88\x01\x01\x12\x19\n" + + "\x05limit\x18\x02 \x01(\x03H\x01R\x05limit\x88\x01\x01\x12\x13\n" + + "\x02id\x18\x03 \x01(\x03H\x02R\x02id\x88\x01\x01\x12\x1f\n" + + "\busername\x18\x04 \x01(\tH\x03R\busername\x88\x01\x01\x12'\n" + + "\fpasswordHash\x18\x05 \x01(\tH\x04R\fpasswordHash\x88\x01\x01\x12\x19\n" + + "\x05phone\x18\x06 \x01(\tH\x05R\x05phone\x88\x01\x01\x12\x19\n" + + "\x05email\x18\a \x01(\tH\x06R\x05email\x88\x01\x01\x12\x1f\n" + + "\bnickname\x18\b \x01(\tH\aR\bnickname\x88\x01\x01\x12\x1b\n" + + "\x06avatar\x18\t \x01(\tH\bR\x06avatar\x88\x01\x01\x12\x15\n" + + "\x03bio\x18\n" + + " \x01(\tH\tR\x03bio\x88\x01\x01\x12%\n" + + "\vcurrentRole\x18\v \x01(\tH\n" + + "R\vcurrentRole\x88\x01\x01\x12$\n" + + "\rverifiedRoles\x18\f \x03(\tR\rverifiedRoles\x123\n" + + "\x12verificationStatus\x18\r \x01(\tH\vR\x12verificationStatus\x88\x01\x01\x12\x1d\n" + + "\aisAdmin\x18\x0e \x01(\bH\fR\aisAdmin\x88\x01\x01\x12!\n" + + "\tcreatedAt\x18\x0f \x01(\x03H\rR\tcreatedAt\x88\x01\x01\x12!\n" + + "\tupdatedAt\x18\x10 \x01(\x03H\x0eR\tupdatedAt\x88\x01\x01\x12!\n" + + "\tdeletedAt\x18\x11 \x01(\x03H\x0fR\tdeletedAt\x88\x01\x01B\a\n" + + "\x05_pageB\b\n" + + "\x06_limitB\x05\n" + + "\x03_idB\v\n" + + "\t_usernameB\x0f\n" + + "\r_passwordHashB\b\n" + + "\x06_phoneB\b\n" + + "\x06_emailB\v\n" + + "\t_nicknameB\t\n" + + "\a_avatarB\x06\n" + + "\x04_bioB\x0e\n" + + "\f_currentRoleB\x15\n" + + "\x13_verificationStatusB\n" + "\n" + - "isVerified\x18\t \x01(\bR\n" + - "isVerified\x12\x14\n" + - "\x05state\x18\n" + - " \x01(\bR\x05state\x12\x1c\n" + - "\tcreatedAt\x18\v \x01(\x03R\tcreatedAt\x12\x1c\n" + - "\tupdatedAt\x18\f \x01(\x03R\tupdatedAt\x12\x1c\n" + - "\tdeletedAt\x18\r \x01(\x03R\tdeletedAt\"2\n" + + "\b_isAdminB\f\n" + + "\n" + + "_createdAtB\f\n" + + "\n" + + "_updatedAtB\f\n" + + "\n" + + "_deletedAt\"2\n" + "\x0fSearchUsersResp\x12\x1f\n" + "\x05users\x18\x01 \x03(\v2\t.pb.UsersR\x05users\"2\n" + "\x14GetUserByUsernameReq\x12\x1a\n" + @@ -1583,7 +1854,13 @@ const file_users_proto_rawDesc = "" + "\tLogoutReq\x12\x16\n" + "\x06userId\x18\x01 \x01(\x03R\x06userId\"\f\n" + "\n" + - "LogoutResp2\xdf\x04\n" + + "LogoutResp\"~\n" + + "\x10ResetPasswordReq\x12 \n" + + "\vnewPassword\x18\x01 \x01(\tR\vnewPassword\x12\x14\n" + + "\x05email\x18\x02 \x01(\tR\x05email\x12\x1c\n" + + "\trequestId\x18\x03 \x01(\tR\trequestId\x12\x14\n" + + "\x05vcode\x18\x04 \x01(\tR\x05vcode\"\x13\n" + + "\x11ResetPasswordResp2\x9d\x05\n" + "\n" + "usercenter\x12-\n" + "\bAddUsers\x12\x0f.pb.AddUsersReq\x1a\x10.pb.AddUsersResp\x126\n" + @@ -1596,7 +1873,8 @@ const file_users_proto_rawDesc = "" + "\bRegister\x12\x0f.pb.RegisterReq\x1a\x10.pb.RegisterResp\x12<\n" + "\rValidateToken\x12\x14.pb.ValidateTokenReq\x1a\x15.pb.ValidateTokenResp\x12B\n" + "\x0fCheckPermission\x12\x16.pb.CheckPermissionReq\x1a\x17.pb.CheckPermissionResp\x12'\n" + - "\x06Logout\x12\r.pb.LogoutReq\x1a\x0e.pb.LogoutRespB\x06Z\x04./pbb\x06proto3" + "\x06Logout\x12\r.pb.LogoutReq\x1a\x0e.pb.LogoutResp\x12<\n" + + "\rResetPassword\x12\x14.pb.ResetPasswordReq\x1a\x15.pb.ResetPasswordRespB\x06Z\x04./pbb\x06proto3" var ( file_users_proto_rawDescOnce sync.Once @@ -1610,7 +1888,7 @@ func file_users_proto_rawDescGZIP() []byte { return file_users_proto_rawDescData } -var file_users_proto_msgTypes = make([]protoimpl.MessageInfo, 23) +var file_users_proto_msgTypes = make([]protoimpl.MessageInfo, 25) var file_users_proto_goTypes = []any{ (*Users)(nil), // 0: pb.Users (*AddUsersReq)(nil), // 1: pb.AddUsersReq @@ -1635,6 +1913,8 @@ var file_users_proto_goTypes = []any{ (*RegisterResp)(nil), // 20: pb.RegisterResp (*LogoutReq)(nil), // 21: pb.LogoutReq (*LogoutResp)(nil), // 22: pb.LogoutResp + (*ResetPasswordReq)(nil), // 23: pb.ResetPasswordReq + (*ResetPasswordResp)(nil), // 24: pb.ResetPasswordResp } var file_users_proto_depIdxs = []int32{ 0, // 0: pb.GetUsersByIdResp.users:type_name -> pb.Users @@ -1651,19 +1931,21 @@ var file_users_proto_depIdxs = []int32{ 15, // 11: pb.usercenter.ValidateToken:input_type -> pb.ValidateTokenReq 17, // 12: pb.usercenter.CheckPermission:input_type -> pb.CheckPermissionReq 21, // 13: pb.usercenter.Logout:input_type -> pb.LogoutReq - 2, // 14: pb.usercenter.AddUsers:output_type -> pb.AddUsersResp - 4, // 15: pb.usercenter.UpdateUsers:output_type -> pb.UpdateUsersResp - 6, // 16: pb.usercenter.DelUsers:output_type -> pb.DelUsersResp - 8, // 17: pb.usercenter.GetUsersById:output_type -> pb.GetUsersByIdResp - 12, // 18: pb.usercenter.GetUserByUsername:output_type -> pb.GetUserByUsernameResp - 10, // 19: pb.usercenter.SearchUsers:output_type -> pb.SearchUsersResp - 14, // 20: pb.usercenter.Login:output_type -> pb.LoginResp - 20, // 21: pb.usercenter.Register:output_type -> pb.RegisterResp - 16, // 22: pb.usercenter.ValidateToken:output_type -> pb.ValidateTokenResp - 18, // 23: pb.usercenter.CheckPermission:output_type -> pb.CheckPermissionResp - 22, // 24: pb.usercenter.Logout:output_type -> pb.LogoutResp - 14, // [14:25] is the sub-list for method output_type - 3, // [3:14] is the sub-list for method input_type + 23, // 14: pb.usercenter.ResetPassword:input_type -> pb.ResetPasswordReq + 2, // 15: pb.usercenter.AddUsers:output_type -> pb.AddUsersResp + 4, // 16: pb.usercenter.UpdateUsers:output_type -> pb.UpdateUsersResp + 6, // 17: pb.usercenter.DelUsers:output_type -> pb.DelUsersResp + 8, // 18: pb.usercenter.GetUsersById:output_type -> pb.GetUsersByIdResp + 12, // 19: pb.usercenter.GetUserByUsername:output_type -> pb.GetUserByUsernameResp + 10, // 20: pb.usercenter.SearchUsers:output_type -> pb.SearchUsersResp + 14, // 21: pb.usercenter.Login:output_type -> pb.LoginResp + 20, // 22: pb.usercenter.Register:output_type -> pb.RegisterResp + 16, // 23: pb.usercenter.ValidateToken:output_type -> pb.ValidateTokenResp + 18, // 24: pb.usercenter.CheckPermission:output_type -> pb.CheckPermissionResp + 22, // 25: pb.usercenter.Logout:output_type -> pb.LogoutResp + 24, // 26: pb.usercenter.ResetPassword:output_type -> pb.ResetPasswordResp + 15, // [15:27] is the sub-list for method output_type + 3, // [3:15] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name 3, // [3:3] is the sub-list for extension extendee 0, // [0:3] is the sub-list for field type_name @@ -1674,13 +1956,15 @@ func file_users_proto_init() { if File_users_proto != nil { return } + file_users_proto_msgTypes[3].OneofWrappers = []any{} + file_users_proto_msgTypes[9].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_users_proto_rawDesc), len(file_users_proto_rawDesc)), NumEnums: 0, - NumMessages: 23, + NumMessages: 25, NumExtensions: 0, NumServices: 1, }, diff --git a/app/users/rpc/pb/users_grpc.pb.go b/app/users/rpc/pb/users_grpc.pb.go index 5cd7f95..2918bff 100644 --- a/app/users/rpc/pb/users_grpc.pb.go +++ b/app/users/rpc/pb/users_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.6.1 -// - protoc v5.29.6 +// - protoc v3.19.4 // source: users.proto package pb @@ -30,6 +30,7 @@ const ( Usercenter_ValidateToken_FullMethodName = "/pb.usercenter/ValidateToken" Usercenter_CheckPermission_FullMethodName = "/pb.usercenter/CheckPermission" Usercenter_Logout_FullMethodName = "/pb.usercenter/Logout" + Usercenter_ResetPassword_FullMethodName = "/pb.usercenter/ResetPassword" ) // UsercenterClient is the client API for Usercenter service. @@ -48,6 +49,7 @@ type UsercenterClient interface { ValidateToken(ctx context.Context, in *ValidateTokenReq, opts ...grpc.CallOption) (*ValidateTokenResp, error) CheckPermission(ctx context.Context, in *CheckPermissionReq, opts ...grpc.CallOption) (*CheckPermissionResp, error) Logout(ctx context.Context, in *LogoutReq, opts ...grpc.CallOption) (*LogoutResp, error) + ResetPassword(ctx context.Context, in *ResetPasswordReq, opts ...grpc.CallOption) (*ResetPasswordResp, error) } type usercenterClient struct { @@ -168,6 +170,16 @@ func (c *usercenterClient) Logout(ctx context.Context, in *LogoutReq, opts ...gr return out, nil } +func (c *usercenterClient) ResetPassword(ctx context.Context, in *ResetPasswordReq, opts ...grpc.CallOption) (*ResetPasswordResp, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ResetPasswordResp) + err := c.cc.Invoke(ctx, Usercenter_ResetPassword_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + // UsercenterServer is the server API for Usercenter service. // All implementations must embed UnimplementedUsercenterServer // for forward compatibility. @@ -184,6 +196,7 @@ type UsercenterServer interface { ValidateToken(context.Context, *ValidateTokenReq) (*ValidateTokenResp, error) CheckPermission(context.Context, *CheckPermissionReq) (*CheckPermissionResp, error) Logout(context.Context, *LogoutReq) (*LogoutResp, error) + ResetPassword(context.Context, *ResetPasswordReq) (*ResetPasswordResp, error) mustEmbedUnimplementedUsercenterServer() } @@ -227,6 +240,9 @@ func (UnimplementedUsercenterServer) CheckPermission(context.Context, *CheckPerm func (UnimplementedUsercenterServer) Logout(context.Context, *LogoutReq) (*LogoutResp, error) { return nil, status.Error(codes.Unimplemented, "method Logout not implemented") } +func (UnimplementedUsercenterServer) ResetPassword(context.Context, *ResetPasswordReq) (*ResetPasswordResp, error) { + return nil, status.Error(codes.Unimplemented, "method ResetPassword not implemented") +} func (UnimplementedUsercenterServer) mustEmbedUnimplementedUsercenterServer() {} func (UnimplementedUsercenterServer) testEmbeddedByValue() {} @@ -446,6 +462,24 @@ func _Usercenter_Logout_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } +func _Usercenter_ResetPassword_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ResetPasswordReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(UsercenterServer).ResetPassword(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: Usercenter_ResetPassword_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(UsercenterServer).ResetPassword(ctx, req.(*ResetPasswordReq)) + } + return interceptor(ctx, in, info, handler) +} + // Usercenter_ServiceDesc is the grpc.ServiceDesc for Usercenter service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -497,6 +531,10 @@ var Usercenter_ServiceDesc = grpc.ServiceDesc{ MethodName: "Logout", Handler: _Usercenter_Logout_Handler, }, + { + MethodName: "ResetPassword", + Handler: _Usercenter_ResetPassword_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "users.proto", diff --git a/app/users/rpc/usercenter/usercenter.go b/app/users/rpc/usercenter/usercenter.go index 75d8de5..3849234 100644 --- a/app/users/rpc/usercenter/usercenter.go +++ b/app/users/rpc/usercenter/usercenter.go @@ -30,6 +30,8 @@ type ( LogoutResp = pb.LogoutResp RegisterReq = pb.RegisterReq RegisterResp = pb.RegisterResp + ResetPasswordReq = pb.ResetPasswordReq + ResetPasswordResp = pb.ResetPasswordResp SearchUsersReq = pb.SearchUsersReq SearchUsersResp = pb.SearchUsersResp UpdateUsersReq = pb.UpdateUsersReq @@ -51,6 +53,7 @@ type ( ValidateToken(ctx context.Context, in *ValidateTokenReq, opts ...grpc.CallOption) (*ValidateTokenResp, error) CheckPermission(ctx context.Context, in *CheckPermissionReq, opts ...grpc.CallOption) (*CheckPermissionResp, error) Logout(ctx context.Context, in *LogoutReq, opts ...grpc.CallOption) (*LogoutResp, error) + ResetPassword(ctx context.Context, in *ResetPasswordReq, opts ...grpc.CallOption) (*ResetPasswordResp, error) } defaultUsercenter struct { @@ -119,3 +122,8 @@ func (m *defaultUsercenter) Logout(ctx context.Context, in *LogoutReq, opts ...g client := pb.NewUsercenterClient(m.cli.Conn()) return client.Logout(ctx, in, opts...) } + +func (m *defaultUsercenter) ResetPassword(ctx context.Context, in *ResetPasswordReq, opts ...grpc.CallOption) (*ResetPasswordResp, error) { + client := pb.NewUsercenterClient(m.cli.Conn()) + return client.ResetPassword(ctx, in, opts...) +} diff --git a/deploy/k8s/envoy/envoy copy.yaml b/backup/envoy copy.yaml similarity index 100% rename from deploy/k8s/envoy/envoy copy.yaml rename to backup/envoy copy.yaml diff --git a/common/redisx/keys.go b/common/redisx/keys.go new file mode 100644 index 0000000..04b7ccb --- /dev/null +++ b/common/redisx/keys.go @@ -0,0 +1,9 @@ +package redisx + +const ( + VCODE_KEY_PREFIX = "vcode:%s:%s:%s" // vocde::: + SCENE_LOGIN = "login" + SCENE_RESET_PWD = "reset_pwd" + SCENE_BIND = "bind" + SCENE_REG = "register" +) diff --git a/deploy/k8s/envoy/envoy.yaml b/deploy/k8s/envoy/envoy.yaml index ad4f8a5..2923373 100644 --- a/deploy/k8s/envoy/envoy.yaml +++ b/deploy/k8s/envoy/envoy.yaml @@ -7,315 +7,319 @@ data: envoy.yaml: | static_resources: listeners: - - name: ingress_http - address: - socket_address: - address: 0.0.0.0 - port_value: 8080 - filter_chains: - - filters: - - name: envoy.filters.network.http_connection_manager - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager - stat_prefix: ingress_http - codec_type: AUTO - generate_request_id: true - use_remote_address: true - internal_address_config: - cidr_ranges: - - address_prefix: 10.0.0.0 - prefix_len: 8 - - address_prefix: 172.16.0.0 - prefix_len: 12 - - address_prefix: 192.168.0.0 - prefix_len: 16 - - address_prefix: 127.0.0.0 - prefix_len: 8 - route_config: - name: local_route - virtual_hosts: - - name: juwan_services - domains: ["*"] - routes: - - match: - path: /healthz - direct_response: - status: 200 - body: - inline_string: ok - typed_per_filter_config: - envoy.filters.http.ext_authz: - "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute - disabled: true - - - match: - path: /api/users/login - route: - cluster: user_api_cluster - timeout: 30s - typed_per_filter_config: - envoy.filters.http.ext_authz: - "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute - disabled: true - - - match: - path: /api/users/register - route: - cluster: user_api_cluster - timeout: 30s - typed_per_filter_config: - envoy.filters.http.ext_authz: - "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute - disabled: true - - - match: - prefix: /api/users - route: - cluster: user_api_cluster - timeout: 30s - - - match: - path: /api/email/verification-code/send - route: - cluster: email_api_cluster - timeout: 30s - typed_per_filter_config: - envoy.filters.http.ext_authz: - "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute - disabled: true - - - match: - prefix: /api/email - route: - cluster: email_api_cluster - timeout: 30s - - - match: - prefix: / - direct_response: - status: 404 - body: - inline_string: "gateway route not found" - - http_filters: - - name: envoy.filters.http.lua - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua - inline_code: | - local TOKEN_HEADER = "xsrf-token" - local TOKEN_COOKIE = "__Host-XSRF-TOKEN" - local GUARD_COOKIE = "__Host-XSRF-GUARD" - - local seeded = false - - local function seed_random() - if seeded then - return - end - seeded = true - math.randomseed(os.time()) - end - - local function split_cookie(header) - local out = {} - if not header then - return out - end - for pair in string.gmatch(header, "([^;]+)") do - local key, value = string.match(pair, "^%s*([^=]+)=?(.*)$") - if key ~= nil and value ~= nil then - out[string.lower(key)] = value - end - end - return out - end - - local function is_safe_method(method) - return method == "GET" or method == "HEAD" or method == "OPTIONS" - end - - local function build_token(request_id) - seed_random() - local rnd = tostring(math.random(100000, 999999)) - local rid = request_id or "rid" - return tostring(os.time()) .. "-" .. rid .. "-" .. rnd - end - - function envoy_on_request(request_handle) - local headers = request_handle:headers() - local method = headers:get(":method") - - local cookie_header = headers:get("cookie") - local cookies = split_cookie(cookie_header) - local token_cookie = cookies[string.lower(TOKEN_COOKIE)] - local guard_cookie = cookies[string.lower(GUARD_COOKIE)] - - request_handle:streamInfo():dynamicMetadata():set("csrf", "need_set_token_cookie", token_cookie == nil or token_cookie == "") - request_handle:streamInfo():dynamicMetadata():set("csrf", "need_set_guard_cookie", guard_cookie == nil or guard_cookie == "") - - if token_cookie == nil or token_cookie == "" then - token_cookie = build_token(headers:get("x-request-id")) - request_handle:streamInfo():dynamicMetadata():set("csrf", "token_value", token_cookie) - else - request_handle:streamInfo():dynamicMetadata():set("csrf", "token_value", token_cookie) - end - - if guard_cookie == nil or guard_cookie == "" then - guard_cookie = build_token(headers:get("x-request-id")) - request_handle:streamInfo():dynamicMetadata():set("csrf", "guard_value", guard_cookie) - else - request_handle:streamInfo():dynamicMetadata():set("csrf", "guard_value", guard_cookie) - end - - if is_safe_method(method) then - return - end - - local token_header = headers:get(TOKEN_HEADER) - - if token_header == nil or token_header == "" then - request_handle:respond( - {[":status"] = "403", ["content-type"] = "application/json"}, - '{"code":403,"message":"missing XSRF-TOKEN header"}' - ) - return - end - - if token_cookie == nil or token_cookie == "" or guard_cookie == nil or guard_cookie == "" then - request_handle:respond( - {[":status"] = "403", ["content-type"] = "application/json"}, - '{"code":403,"message":"missing csrf cookies"}' - ) - return - end - - if token_header ~= token_cookie then - request_handle:respond( - {[":status"] = "403", ["content-type"] = "application/json"}, - '{"code":403,"message":"xsrf token mismatch"}' - ) - return - end - end - - function envoy_on_response(response_handle) - local metadata = response_handle:streamInfo():dynamicMetadata():get("csrf") - if metadata == nil then - return - end - - local token_value = metadata["token_value"] - local guard_value = metadata["guard_value"] - - if metadata["need_set_token_cookie"] == true and token_value ~= nil and token_value ~= "" then - response_handle:headers():add( - "set-cookie", - TOKEN_COOKIE .. "=" .. token_value .. "; Path=/; Max-Age=7200; SameSite=Strict; Secure" - ) - end - - if metadata["need_set_guard_cookie"] == true and guard_value ~= nil and guard_value ~= "" then - response_handle:headers():add( - "set-cookie", - GUARD_COOKIE .. "=" .. guard_value .. "; Path=/; Max-Age=7200; SameSite=Strict; Secure; HttpOnly" - ) - end - end - - - name: envoy.filters.http.jwt_authn - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication - providers: - juwan_user_jwt: - issuer: "juwan-user-rpc" - from_cookies: - - "JToken" - local_jwks: - inline_string: '{"keys":[{"kty":"oct","k":"MGUyMWE3ZDhjMTQ5ZDg1MWViOWU0MGM3OTE2NWVkYTBlOTE5ZWRkZDU1YjYzOGJjOWRiNzM0NTc4NDIyMjlkZQ","alg":"HS256","use":"sig","kid":"juwan-hs256-1"}]}' - forward: false - claim_to_headers: - - header_name: "x-auth-user-id" - claim_name: "UserId" - - header_name: "x-auth-is-admin" - claim_name: "IsAdmin" - rules: - - match: - path: "/healthz" - - match: - path: "/api/users/login" - - match: - path: "/api/users/register" - - match: - path: "/api/email/verification-code/send" - - match: - prefix: "/api/users" - requires: - provider_name: juwan_user_jwt - - match: - prefix: "/api/email" - requires: - provider_name: juwan_user_jwt - - - name: envoy.filters.http.ext_authz - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz - transport_api_version: V3 - failure_mode_allow: false - with_request_body: - max_request_bytes: 8192 - allow_partial_message: true - grpc_service: - envoy_grpc: - cluster_name: authz_adapter_cluster - timeout: 0.5s - - - name: envoy.filters.http.router - typed_config: - "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router + - name: ingress_http + address: + socket_address: + address: 0.0.0.0 + port_value: 8080 + filter_chains: + - filters: + - name: envoy.filters.network.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + stat_prefix: ingress_http + codec_type: AUTO + generate_request_id: true + use_remote_address: true + internal_address_config: + cidr_ranges: + - address_prefix: 10.0.0.0 + prefix_len: 8 + - address_prefix: 172.16.0.0 + prefix_len: 12 + - address_prefix: 192.168.0.0 + prefix_len: 16 + - address_prefix: 127.0.0.0 + prefix_len: 8 + route_config: + name: local_route + virtual_hosts: + - name: juwan_services + domains: ["*"] + routes: + - match: + path: /healthz + direct_response: + status: 200 + body: + inline_string: ok + typed_per_filter_config: + envoy.filters.http.ext_authz: + "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute + disabled: true + + - match: + prefix: /api/v1/auth/login + route: + cluster: user_api_cluster + timeout: 30s + typed_per_filter_config: + envoy.filters.http.ext_authz: + "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute + disabled: true + + - match: + prefix: /api/v1/auth/register + route: + cluster: user_api_cluster + timeout: 30s + typed_per_filter_config: + envoy.filters.http.ext_authz: + "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute + disabled: true + + - match: + prefix: /api/users + route: + cluster: user_api_cluster + timeout: 30s + typed_per_filter_config: + envoy.filters.http.ext_authz: + "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute + disabled: true + + - match: + path: /api/email/verification-code/send + route: + cluster: email_api_cluster + timeout: 30s + typed_per_filter_config: + envoy.filters.http.ext_authz: + "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthzPerRoute + disabled: true + + - match: + prefix: /api/email + route: + cluster: email_api_cluster + timeout: 30s + + - match: + prefix: / + direct_response: + status: 404 + body: + inline_string: "gateway route not found" + + http_filters: + - name: envoy.filters.http.lua + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua + inline_code: | + local TOKEN_HEADER = "xsrf-token" + local TOKEN_COOKIE = "__Host-XSRF-TOKEN" + local GUARD_COOKIE = "__Host-XSRF-GUARD" + + local seeded = false + + local function seed_random() + if seeded then + return + end + seeded = true + math.randomseed(os.time()) + end + + local function split_cookie(header) + local out = {} + if not header then + return out + end + for pair in string.gmatch(header, "([^;]+)") do + local key, value = string.match(pair, "^%s*([^=]+)=?(.*)$") + if key ~= nil and value ~= nil then + out[string.lower(key)] = value + end + end + return out + end + + local function is_safe_method(method) + return method == "GET" or method == "HEAD" or method == "OPTIONS" + end + + local function build_token(request_id) + seed_random() + local rnd = tostring(math.random(100000, 999999)) + local rid = request_id or "rid" + return tostring(os.time()) .. "-" .. rid .. "-" .. rnd + end + + function envoy_on_request(request_handle) + local headers = request_handle:headers() + local method = headers:get(":method") + + local cookie_header = headers:get("cookie") + local cookies = split_cookie(cookie_header) + local token_cookie = cookies[string.lower(TOKEN_COOKIE)] + local guard_cookie = cookies[string.lower(GUARD_COOKIE)] + + request_handle:streamInfo():dynamicMetadata():set("csrf", "need_set_token_cookie", token_cookie == nil or token_cookie == "") + request_handle:streamInfo():dynamicMetadata():set("csrf", "need_set_guard_cookie", guard_cookie == nil or guard_cookie == "") + + if token_cookie == nil or token_cookie == "" then + token_cookie = build_token(headers:get("x-request-id")) + request_handle:streamInfo():dynamicMetadata():set("csrf", "token_value", token_cookie) + else + request_handle:streamInfo():dynamicMetadata():set("csrf", "token_value", token_cookie) + end + + if guard_cookie == nil or guard_cookie == "" then + guard_cookie = build_token(headers:get("x-request-id")) + request_handle:streamInfo():dynamicMetadata():set("csrf", "guard_value", guard_cookie) + else + request_handle:streamInfo():dynamicMetadata():set("csrf", "guard_value", guard_cookie) + end + + if is_safe_method(method) then + return + end + + local token_header = headers:get(TOKEN_HEADER) + + if token_header == nil or token_header == "" then + request_handle:respond( + {[":status"] = "403", ["content-type"] = "application/json"}, + '{"code":403,"message":"missing XSRF-TOKEN header"}' + ) + return + end + + if token_cookie == nil or token_cookie == "" or guard_cookie == nil or guard_cookie == "" then + request_handle:respond( + {[":status"] = "403", ["content-type"] = "application/json"}, + '{"code":403,"message":"missing csrf cookies"}' + ) + return + end + + if token_header ~= token_cookie then + request_handle:respond( + {[":status"] = "403", ["content-type"] = "application/json"}, + '{"code":403,"message":"xsrf token mismatch"}' + ) + return + end + end + + function envoy_on_response(response_handle) + local metadata = response_handle:streamInfo():dynamicMetadata():get("csrf") + if metadata == nil then + return + end + + local token_value = metadata["token_value"] + local guard_value = metadata["guard_value"] + + if metadata["need_set_token_cookie"] == true and token_value ~= nil and token_value ~= "" then + response_handle:headers():add( + "set-cookie", + TOKEN_COOKIE .. "=" .. token_value .. "; Path=/; Max-Age=7200; SameSite=Strict; Secure" + ) + end + + if metadata["need_set_guard_cookie"] == true and guard_value ~= nil and guard_value ~= "" then + response_handle:headers():add( + "set-cookie", + GUARD_COOKIE .. "=" .. guard_value .. "; Path=/; Max-Age=7200; SameSite=Strict; Secure; HttpOnly" + ) + end + end + + - name: envoy.filters.http.jwt_authn + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication + providers: + juwan_user_jwt: + issuer: "juwan-user-rpc" + from_cookies: + - "JToken" + local_jwks: + inline_string: '{"keys":[{"kty":"oct","k":"MGUyMWE3ZDhjMTQ5ZDg1MWViOWU0MGM3OTE2NWVkYTBlOTE5ZWRkZDU1YjYzOGJjOWRiNzM0NTc4NDIyMjlkZQ","alg":"HS256","use":"sig","kid":"juwan-hs256-1"}]}' + forward: false + claim_to_headers: + - header_name: "x-auth-user-id" + claim_name: "UserId" + - header_name: "x-auth-is-admin" + claim_name: "IsAdmin" + rules: + - match: + path: "/healthz" + - match: + path: "/api/v1/auth/login" + - match: + path: "/api/v1/auth/register" + - match: + path: "/api/v1/email/verification-code/send" + - match: + prefix: "/api/users" + requires: + provider_name: juwan_user_jwt + - match: + prefix: "/api/email" + requires: + provider_name: juwan_user_jwt + + - name: envoy.filters.http.ext_authz + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.ext_authz.v3.ExtAuthz + transport_api_version: V3 + failure_mode_allow: false + with_request_body: + max_request_bytes: 8192 + allow_partial_message: true + grpc_service: + envoy_grpc: + cluster_name: authz_adapter_cluster + timeout: 0.5s + + - name: envoy.filters.http.router + typed_config: + "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router clusters: - - name: user_api_cluster - connect_timeout: 2s - type: STRICT_DNS - lb_policy: ROUND_ROBIN - load_assignment: - cluster_name: user_api_cluster - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: user-api-svc.juwan.svc.cluster.local - port_value: 8888 - - - name: email_api_cluster - connect_timeout: 2s - type: STRICT_DNS - lb_policy: ROUND_ROBIN - load_assignment: - cluster_name: email_api_cluster - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: email-api-svc.juwan.svc.cluster.local - port_value: 8888 - - - name: authz_adapter_cluster - connect_timeout: 0.5s - type: STRICT_DNS - lb_policy: ROUND_ROBIN - http2_protocol_options: {} - load_assignment: - cluster_name: authz_adapter_cluster - endpoints: - - lb_endpoints: - - endpoint: - address: - socket_address: - address: authz-adapter-svc.juwan.svc.cluster.local - port_value: 9002 + - name: user_api_cluster + connect_timeout: 2s + type: STRICT_DNS + lb_policy: ROUND_ROBIN + load_assignment: + cluster_name: user_api_cluster + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: user-api-svc.juwan.svc.cluster.local + port_value: 8888 + + - name: email_api_cluster + connect_timeout: 2s + type: STRICT_DNS + lb_policy: ROUND_ROBIN + load_assignment: + cluster_name: email_api_cluster + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: email-api-svc.juwan.svc.cluster.local + port_value: 8888 + + - name: authz_adapter_cluster + connect_timeout: 0.5s + type: STRICT_DNS + lb_policy: ROUND_ROBIN + http2_protocol_options: {} + load_assignment: + cluster_name: authz_adapter_cluster + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: authz-adapter-svc.juwan.svc.cluster.local + port_value: 9002 admin: access_log_path: /tmp/admin_access.log diff --git a/deploy/k8s/secrets/jwt-secret.yaml b/deploy/k8s/secrets/jwt-secret.yaml index 7240df9..7d7e643 100644 --- a/deploy/k8s/secrets/jwt-secret.yaml +++ b/deploy/k8s/secrets/jwt-secret.yaml @@ -30,7 +30,7 @@ rules: resources: ["secrets"] resourceNames: ["jwt-secret"] verbs: ["get"] - # 服务发现权限 (go-zero 框架需要) + # 服务发现权限 - apiGroups: [""] resources: ["endpoints"] verbs: ["get", "list", "watch"] diff --git a/deploy/k8s/secrets/rc-creds.yaml b/deploy/k8s/secrets/rc-creds.yaml new file mode 100644 index 0000000..64cbbcc --- /dev/null +++ b/deploy/k8s/secrets/rc-creds.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Secret +metadata: + name: rc-creds + namespace: juwan + +data: + ACCESS_KEY_ID: U091Y3FSYUpyNE95ZmNJdQ== + SECRET_ACCESS_KEY: dG4yQWdqOUVvd013dVBBOXk3VGRTTDBBWEtzTUV6 diff --git a/deploy/k8s/service/authz/authz-adapter.yaml b/deploy/k8s/service/authz/authz-adapter.yaml index 0e248c3..8df524e 100644 --- a/deploy/k8s/service/authz/authz-adapter.yaml +++ b/deploy/k8s/service/authz/authz-adapter.yaml @@ -19,7 +19,9 @@ spec: serviceAccountName: find-endpoints containers: - name: authz-adapter - image: 103.236.53.208:4418/library/authz-adapter@sha256:84dd29596f94dd38d3a7a7924f4d5ed71b661b6d2a78d65c1741b11c2d8eea98 +# image: 103.236.53.208:4418/library/authz-adapter@sha256:84dd29596f94dd38d3a7a7924f4d5ed71b661b6d2a78d65c1741b11c2d8eea98 + image: authz-adapter:latest + imagePullPolicy: Always ports: - containerPort: 9002 name: grpc diff --git a/deploy/k8s/service/email/email-api.yaml b/deploy/k8s/service/email/email-api.yaml index f4c1950..42eeae1 100644 --- a/deploy/k8s/service/email/email-api.yaml +++ b/deploy/k8s/service/email/email-api.yaml @@ -19,7 +19,8 @@ spec: serviceAccountName: find-endpoints containers: - name: email-api - image: 103.236.53.208:4418/library/email-api@sha256:fe5c66f5bcb1a39652620df42351de3e48227920a34be3110a45eb13db327020 +# image: 103.236.53.208:4418/library/email-api@sha256:fe5c66f5bcb1a39652620df42351de3e48227920a34be3110a45eb13db327020 + image: email-api:latest ports: - containerPort: 8888 - containerPort: 4001 diff --git a/deploy/k8s/service/email/email-mq.yaml b/deploy/k8s/service/email/email-mq.yaml index 3241f7f..ee2d14a 100644 --- a/deploy/k8s/service/email/email-mq.yaml +++ b/deploy/k8s/service/email/email-mq.yaml @@ -24,7 +24,8 @@ spec: serviceAccountName: find-endpoints containers: - name: email-consumer - image: 103.236.53.208:4418/library/email-mq@sha256:a9f76e8f4a17d1c00cefc429962037550e17feebb5cf38b28d360c91c8ba3e68 +# image: 103.236.53.208:4418/library/email-mq@sha256:a9f76e8f4a17d1c00cefc429962037550e17feebb5cf38b28d360c91c8ba3e68 + image: email-mq:latest ports: - containerPort: 4001 resources: diff --git a/deploy/k8s/service/snowflake/snowflake.yaml b/deploy/k8s/service/snowflake/snowflake.yaml index e65b28b..9f46f98 100644 --- a/deploy/k8s/service/snowflake/snowflake.yaml +++ b/deploy/k8s/service/snowflake/snowflake.yaml @@ -19,7 +19,8 @@ spec: serviceAccountName: find-endpoints containers: - name: snowflake - image: 103.236.53.208:4418/library/snowflake@sha256:1679cf94b69f426eec5d2f960ffb153bb7dbcd3bcaf0286261a43756384a86b3 +# image: 103.236.53.208:4418/library/snowflake@sha256:1679cf94b69f426eec5d2f960ffb153bb7dbcd3bcaf0286261a43756384a86b3 + image: snowflake:latest ports: - containerPort: 8080 readinessProbe: diff --git a/deploy/k8s/service/user/user-api.yaml b/deploy/k8s/service/user/user-api.yaml index 00a0167..d975ec9 100644 --- a/deploy/k8s/service/user/user-api.yaml +++ b/deploy/k8s/service/user/user-api.yaml @@ -18,37 +18,38 @@ spec: spec: serviceAccountName: find-endpoints containers: - - name: user-api - image: 103.236.53.208:4418/library/user-api@sha256:d3187beb9c777a8dcbdc6a835a7887cb29fbea9571b08fe538a1eece403226e2 - ports: - - containerPort: 8888 - readinessProbe: - tcpSocket: - port: 8888 - initialDelaySeconds: 5 - periodSeconds: 10 - livenessProbe: - tcpSocket: - port: 8888 - initialDelaySeconds: 15 - periodSeconds: 20 - resources: - requests: - cpu: 500m - memory: 512Mi - limits: - cpu: 1000m - memory: 1024Mi - volumeMounts: - - name: timezone - mountPath: /etc/localtime + - name: user-api +# image: 103.236.53.208:4418/library/user-api@sha256:d3187beb9c777a8dcbdc6a835a7887cb29fbea9571b08fe538a1eece403226e2 + image: user-api:latest + imagePullPolicy: Always + ports: + - containerPort: 8888 + readinessProbe: + tcpSocket: + port: 8888 + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + tcpSocket: + port: 8888 + initialDelaySeconds: 15 + periodSeconds: 20 + resources: + requests: + cpu: 500m + memory: 512Mi + limits: + cpu: 1000m + memory: 1024Mi + volumeMounts: + - name: timezone + mountPath: /etc/localtime volumes: - name: timezone hostPath: path: /usr/share/zoneinfo/Asia/Shanghai --- - apiVersion: v1 kind: Service metadata: @@ -56,55 +57,53 @@ metadata: namespace: juwan spec: ports: - - port: 8888 - targetPort: 8888 + - port: 8888 + targetPort: 8888 selector: app: user-api -#--- -# -#apiVersion: autoscaling/v2 -#kind: HorizontalPodAutoscaler -#metadata: -# name: user-api-hpa-c -# namespace: juwan -# labels: -# app: user-api-hpa-c -#spec: -# scaleTargetRef: -# apiVersion: apps/v1 -# kind: Deployment -# name: user-api -# minReplicas: 3 -# maxReplicas: 10 -# metrics: -# - type: Resource -# resource: -# name: cpu -# target: -# type: Utilization -# averageUtilization: 80 -# -#--- -# -#apiVersion: autoscaling/v2 -#kind: HorizontalPodAutoscaler -#metadata: -# name: user-api-hpa-m -# namespace: juwan -# labels: -# app: user-api-hpa-m -#spec: -# scaleTargetRef: -# apiVersion: apps/v1 -# kind: Deployment -# name: user-api -# minReplicas: 3 -# maxReplicas: 10 -# metrics: -# - type: Resource -# resource: -# name: memory -# target: -# type: Utilization -# averageUtilization: 80 +--- +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: user-api-hpa-c + namespace: juwan + labels: + app: user-api-hpa-c +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: user-api + minReplicas: 3 + maxReplicas: 10 + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: 80 + +--- +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: user-api-hpa-m + namespace: juwan + labels: + app: user-api-hpa-m +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: user-api + minReplicas: 3 + maxReplicas: 10 + metrics: + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: 80 diff --git a/deploy/k8s/service/user/user-rpc.yaml b/deploy/k8s/service/user/user-rpc.yaml index c9d87d1..eda1d4f 100644 --- a/deploy/k8s/service/user/user-rpc.yaml +++ b/deploy/k8s/service/user/user-rpc.yaml @@ -6,7 +6,7 @@ metadata: labels: app: user-rpc spec: - replicas: 1 + replicas: 3 revisionHistoryLimit: 5 selector: matchLabels: @@ -29,7 +29,9 @@ spec: ] containers: - name: user-rpc - image: 103.236.53.208:4418/library/user-rpc@sha256:28d785c4152d28b5cb368316e0fb3d48d728303e4439cdce13ebdbc5af8d19ce +# image: 103.236.53.208:4418/library/user-rpc@sha256:28d785c4152d28b5cb368316e0fb3d48d728303e4439cdce13ebdbc5af8d19ce + image: user-rpc:latest + imagePullPolicy: Always ports: - containerPort: 9001 - containerPort: 4001 @@ -114,52 +116,52 @@ spec: selector: app: user-rpc -#--- -#apiVersion: autoscaling/v2 -#kind: HorizontalPodAutoscaler -#metadata: -# name: user-rpc-hpa-c -# namespace: juwan -# labels: -# app: user-rpc-hpa-c -#spec: -# scaleTargetRef: -# apiVersion: apps/v1 -# kind: Deployment -# name: user-rpc -# minReplicas: 3 -# maxReplicas: 10 -# metrics: -# - type: Resource -# resource: -# name: cpu -# target: -# type: Utilization -# averageUtilization: 80 -# -#--- -#apiVersion: autoscaling/v2 -#kind: HorizontalPodAutoscaler -#metadata: -# name: user-rpc-hpa-m -# namespace: juwan -# labels: -# app: user-rpc-hpa-m -#spec: -# scaleTargetRef: -# apiVersion: apps/v1 -# kind: Deployment -# name: user-rpc -# minReplicas: 3 -# maxReplicas: 10 -# metrics: -# - type: Resource -# resource: -# name: memory -# target: -# type: Utilization -# averageUtilization: 80 -#--- +--- +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: user-rpc-hpa-c + namespace: juwan + labels: + app: user-rpc-hpa-c +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: user-rpc + minReplicas: 3 + maxReplicas: 10 + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: 80 + +--- +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: user-rpc-hpa-m + namespace: juwan + labels: + app: user-rpc-hpa-m +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: user-rpc + minReplicas: 3 + maxReplicas: 10 + metrics: + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: 80 +--- # Redis 主从复制 apiVersion: redis.redis.opstreelabs.in/v1beta2 kind: RedisReplication diff --git a/desc/api/email.api b/desc/api/email.api index 46aefd6..72d22f0 100644 --- a/desc/api/email.api +++ b/desc/api/email.api @@ -7,6 +7,10 @@ info ( ) type ( + EmptyResp {} + ForgotPasswordReq { + Email string `json:"email"` + } SendVerificationCodeReq { Email string `json:"email" binding:"required,email"` Scene string `json:"scene" binding:"required,oneof=register login reset_password bind_email"` @@ -30,5 +34,18 @@ service email-api { ) @handler SendVerificationCode post /verification-code/send (SendVerificationCodeReq) returns (SendVerificationCodeResp) + + +} + +@server ( + group: user + prefix: /api/v1/auth + +) +service email-api { + @doc "忘记密码-发送验证码" + @handler ForgotPassword + post /forgot-password/send (ForgotPasswordReq) returns (EmptyResp) } diff --git a/desc/api/users.api b/desc/api/users.api index 4bebd92..181c728 100644 --- a/desc/api/users.api +++ b/desc/api/users.api @@ -1,126 +1,164 @@ syntax = "v1" -info ( - author: "Asadz" - date: "2024-06-19" - version: "1.0" +info( + author: "Asadz" + date: "2024-06-19" + version: "1.0" ) type ( - RegisterReq { - Username string `json:"username" binding:"required,min=3,max=50"` - Password string `json:"password" binding:"required,min=6,max=128"` - Email string `json:"email,omitempty" binding:"omitempty,email"` - Phone string `json:"phone,omitempty" binding:"omitempty,len=11"` - Vcode int32 `json:"vcode"` - } - RegisterResp { - UserId int64 `json:"userId"` - Username string `json:"username"` - Email string `json:"email"` - Message string `json:"message"` - } - LoginReq { - Username string `json:"username" binding:"required"` - Password string `json:"password" binding:"required"` - } - LoginResp { - UserId int64 `json:"userId"` - Username string `json:"username"` - Email string `json:"email"` - Token string `json:"token"` - Expires int64 `json:"expires"` - } - GetUserInfoReq { - UserId int64 `path:"userId" binding:"required,gt=0"` - } - UserInfo { - UserId int64 `json:"userId"` - Username string `json:"username"` - Email string `json:"email"` - Phone string `json:"phone"` - Avatar string `json:"avatar"` - Status int `json:"status"` - CreateAt int64 `json:"createAt"` - UpdateAt int64 `json:"updateAt"` - } - UpdateUserInfoReq { - UserId int64 `path:"userId" binding:"required,gt=0"` - Email string `json:"email" binding:"omitempty,email"` - Phone string `json:"phone" binding:"omitempty,len=11"` - Avatar string `json:"avatar" binding:"omitempty,url"` - } - UpdateUserInfoResp { - UserId int64 `json:"userId"` - Message string `json:"message"` - } - UpdatePasswordReq { - UserId int64 `path:"userId" binding:"required,gt=0"` - OldPassword string `json:"oldPassword" binding:"required"` - NewPassword string `json:"newPassword" binding:"required,min=6,max=128"` - } - UpdatePasswordResp { - Message string `json:"message"` - } - LogoutReq { - UserId int64 `path:"userId" binding:"required,gt=0"` - Token string `header:"Authorization" binding:"required"` - } - LogoutResp { - Message string `json:"message"` - } - ErrorResp { - Code int `json:"code"` - Message string `json:"message"` - } + EmptyResp { + } + SearchUserResp { + Username string `json:"username"` + UserId int64 `json:"userId"` + Nickname string `json:"nickname"` + Avatar string `json:"avatar"` + Bio string `json:"bio"` + Page int64 `json:"page"` + Limit int64 `json:"limit"` + } + ResetPasswordByVcode { + Email string `json:"email"` + Password string `json:"password"` + Vcode string `json:"vcode"` + } + RegisterReq { + Username string `json:"username" binding:"required,min=3,max=50"` + Password string `json:"password" binding:"required,min=6,max=128"` + Email string `json:"email,omitempty" binding:"omitempty,email"` + Phone string `json:"phone,omitempty" binding:"omitempty,len=11"` + Vcode int32 `json:"vcode"` + } + RegisterResp { + UserId int64 `json:"userId"` + Username string `json:"username"` + Email string `json:"email"` + Message string `json:"message"` + } + LoginReq { + Username string `json:"username" binding:"required"` + Password string `json:"password" binding:"required"` + } + LoginResp { + UserId int64 `json:"userId"` + Username string `json:"username"` + Email string `json:"email"` + Token string `json:"token"` + Expires int64 `json:"expires"` + } + GetUserInfoReq { + UserId int64 `path:"userId" binding:"required,gt=0"` + } + UserInfo { + UserId int64 `json:"userId"` + Username string `json:"username"` + Email string `json:"email"` + Phone string `json:"phone"` + Avatar string `json:"avatar"` + Status int `json:"status"` + CreateAt int64 `json:"createAt"` + UpdateAt int64 `json:"updateAt"` + } + UpdateUserInfoReq { + Nickname *string `json:"nickname,omitempty"` + Avatar *string `json:"avatar,omitempty"` + Bio *string `json:"bio,omitempty"` + } + UpdateUserInfoResp { + UserId int64 `json:"userId"` + Message string `json:"message"` + } + UpdatePasswordReq { + UserId int64 `path:"userId" binding:"required,gt=0"` + OldPassword string `json:"oldPassword" binding:"required"` + NewPassword string `json:"newPassword" binding:"required,min=6,max=128"` + } + UpdatePasswordResp { + Message string `json:"message"` + } + LogoutReq { + UserId int64 `path:"userId" binding:"required,gt=0"` + Token string `header:"Authorization" binding:"required"` + } + LogoutResp { + Message string `json:"message"` + } + ErrorResp { + Code int `json:"code"` + Message string `json:"message"` + } ) -@server ( - group: user - prefix: /api/users - middleware: Logger +@server( + group: user + prefix: /api/v1/auth + middleware: Logger ) service user-api { - @doc ( - summary: "用户注册接口" - description: "通过用户名、密码、邮箱、电话号码注册新用户账户" - ) - @handler Register - post /register (RegisterReq) returns (RegisterResp) + @doc( + summary: "用户注册接口" + description: "通过用户名、密码、邮箱、电话号码注册新用户账户" + ) + @handler Register + post /register (RegisterReq) returns (RegisterResp) - @doc ( - summary: "用户登录接口" - description: "使用用户名和密码进行登录，返回访问令牌和用户信息" - ) - @handler Login - post /login (LoginReq) returns (LoginResp) + @doc( + summary: "用户登录接口" + description: "使用用户名和密码进行登录，返回访问令牌和用户信息" + ) + @handler Login + post /login (LoginReq) returns (LoginResp) - @doc ( - summary: "获取用户信息" - description: "根据用户ID获取用户的详细信息，包含个人资料和账户状态" - ) - @handler GetUserInfo - get /:userId (GetUserInfoReq) returns (UserInfo) + @doc( + summary: "修改用户密码" + description: "验证旧密码后修改为新密码，需要提供原密码" + ) + @handler UpdatePassword + put /:userId/password (UpdatePasswordReq) returns (UpdatePasswordResp) - @doc ( - summary: "修改用户信息" - description: "修改用户的邮箱、电话号码、头像等信息" - ) - @handler UpdateUserInfo - put /:userId (UpdateUserInfoReq) returns (UpdateUserInfoResp) + @doc( + summary: "用户登出" + description: "需要携带 Authorization 令牌，清除用户会话并使令牌失效" + ) + @handler Logout + post /:userId/logout (LogoutReq) returns (LogoutResp) - @doc ( - summary: "修改用户密码" - description: "验证旧密码后修改为新密码，需要提供原密码" - ) - @handler UpdatePassword - put /:userId/password (UpdatePasswordReq) returns (UpdatePasswordResp) - - @doc ( - summary: "用户登出" - description: "需要携带 Authorization 令牌，清除用户会话并使令牌失效" - ) - @handler Logout - post /:userId/logout (LogoutReq) returns (LogoutResp) + @doc "修改密码-使用验证码" + @handler UpdatePasswordByVcode + put /forgot-password/reset (ResetPasswordByVcode) returns (EmptyResp) +} + +@server( + group: user + prefix: /api/v1/user + middleware: Logger +) +service user-api { + @doc "获取当前登录用户信息" + @handler GetMe + get /me returns (UserInfo) + + @doc "通过用户名搜索用户" + @handler SearchUsersByUsername + get /search () returns ([]UserInfo) + + @doc "更改当前登录用户信息" + @handler UpdateMe + put /me (UpdateUserInfoReq) returns (UserInfo) + + @doc( + summary: "获取用户信息" + description: "根据用户ID获取用户的详细信息，包含个人资料和账户状态" + ) + @handler GetUserInfo + get /:userId (GetUserInfoReq) returns (UserInfo) + + @doc( + summary: "修改用户信息" + description: "修改用户的邮箱、电话号码、头像等信息" + ) + @handler UpdateUserInfo + put /:userId (UpdateUserInfoReq) returns (UpdateUserInfoResp) } diff --git a/desc/rpc/user_verifications.proto b/desc/rpc/user_verifications.proto new file mode 100644 index 0000000..bb92da9 --- /dev/null +++ b/desc/rpc/user_verifications.proto @@ -0,0 +1,105 @@ +syntax = "proto3"; + +option go_package ="./pb"; + +package pb; + +// ------------------------------------ +// Messages +// ------------------------------------ + +//--------------------------------userVerifications-------------------------------- +message UserVerifications { + int64 id = 1; //id + int64 userId = 2; //userId + string role = 3; //role + string status = 4; //status + string materials = 5; //materials + string rejectReason = 6; //rejectReason + int64 reviewedBy = 7; //reviewedBy + int64 reviewedAt = 8; //reviewedAt + int64 createdAt = 9; //createdAt + int64 updatedAt = 10; //updatedAt +} + +message AddUserVerificationsReq { + int64 userId = 1; //userId + string role = 2; //role + string status = 3; //status + string materials = 4; //materials + string rejectReason = 5; //rejectReason + int64 reviewedBy = 6; //reviewedBy + int64 reviewedAt = 7; //reviewedAt + int64 createdAt = 8; //createdAt + int64 updatedAt = 9; //updatedAt +} + +message AddUserVerificationsResp { +} + +message UpdateUserVerificationsReq { + int64 id = 1; //id + int64 userId = 2; //userId + string role = 3; //role + string status = 4; //status + string materials = 5; //materials + string rejectReason = 6; //rejectReason + int64 reviewedBy = 7; //reviewedBy + int64 reviewedAt = 8; //reviewedAt + int64 createdAt = 9; //createdAt + int64 updatedAt = 10; //updatedAt +} + +message UpdateUserVerificationsResp { +} + +message DelUserVerificationsReq { + int64 id = 1; //id +} + +message DelUserVerificationsResp { +} + +message GetUserVerificationsByIdReq { + int64 id = 1; //id +} + +message GetUserVerificationsByIdResp { + UserVerifications userVerifications = 1; //userVerifications +} + +message SearchUserVerificationsReq { + int64 page = 1; //page + int64 limit = 2; //limit + int64 id = 3; //id + int64 userId = 4; //userId + string role = 5; //role + string status = 6; //status + string materials = 7; //materials + string rejectReason = 8; //rejectReason + int64 reviewedBy = 9; //reviewedBy + int64 reviewedAt = 10; //reviewedAt + int64 createdAt = 11; //createdAt + int64 updatedAt = 12; //updatedAt +} + +message SearchUserVerificationsResp { + repeated UserVerifications userVerifications = 1; //userVerifications +} + + + +// ------------------------------------ +// Rpc Func +// ------------------------------------ + +service user_verifications{ + + //-----------------------userVerifications----------------------- + rpc AddUserVerifications(AddUserVerificationsReq) returns (AddUserVerificationsResp); + rpc UpdateUserVerifications(UpdateUserVerificationsReq) returns (UpdateUserVerificationsResp); + rpc DelUserVerifications(DelUserVerificationsReq) returns (DelUserVerificationsResp); + rpc GetUserVerificationsById(GetUserVerificationsByIdReq) returns (GetUserVerificationsByIdResp); + rpc SearchUserVerifications(SearchUserVerificationsReq) returns (SearchUserVerificationsResp); + +} diff --git a/desc/rpc/users.proto b/desc/rpc/users.proto index 6514cf1..7ef7119 100644 --- a/desc/rpc/users.proto +++ b/desc/rpc/users.proto @@ -8,50 +8,62 @@ package pb; // Messages // ------------------------------------ +//--------------------------------users-------------------------------- //--------------------------------users-------------------------------- message Users { - int64 userId = 1; //userId + int64 id = 1; //id string username = 2; //username - string passwd = 3; //passwd - string nickname = 4; //nickname - string phone = 5; //phone - int64 roleType = 6; //roleType - bool isVerified = 7; //isVerified - bool state = 8; //state - int64 createdAt = 9; //createdAt - int64 updatedAt = 10; //updatedAt - int64 deletedAt = 11; //deletedAt + string passwordHash = 3; //passwordHash + string phone = 4; //phone + string email = 5; //email + string nickname = 6; //nickname + string avatar = 7; //avatar + string bio = 8; //bio + string currentRole = 9; //currentRole + repeated string verifiedRoles = 10; //verifiedRoles + string verificationStatus = 11; //verificationStatus + bool isAdmin = 12; //isAdmin + int64 createdAt = 13; //createdAt + int64 updatedAt = 14; //updatedAt + int64 deletedAt = 15; //deletedAt } message AddUsersReq { - int64 userId = 1; //userId - string username = 2; //username - string passwd = 3; //passwd - string nickname = 4; //nickname - string phone = 5; //phone - int64 roleType = 6; //roleType - bool isVerified = 7; //isVerified - bool state = 8; //state - int64 createdAt = 9; //createdAt - int64 updatedAt = 10; //updatedAt - int64 deletedAt = 11; //deletedAt + string username = 1; //username + string passwordHash = 2; //passwordHash + string phone = 3; //phone + string email = 4; //email + string nickname = 5; //nickname + string avatar = 6; //avatar + string bio = 7; //bio + string currentRole = 8; //currentRole + repeated string verifiedRoles = 9; //verifiedRoles + string verificationStatus = 10; //verificationStatus + bool isAdmin = 11; //isAdmin + int64 createdAt = 12; //createdAt + int64 updatedAt = 13; //updatedAt + int64 deletedAt = 14; //deletedAt } message AddUsersResp { } message UpdateUsersReq { - int64 userId = 1; //userId - string username = 2; //username - string passwd = 3; //passwd - string nickname = 4; //nickname - string phone = 5; //phone - int64 roleType = 6; //roleType - bool isVerified = 7; //isVerified - bool state = 8; //state - int64 createdAt = 9; //createdAt - int64 updatedAt = 10; //updatedAt - int64 deletedAt = 11; //deletedAt + int64 id = 1; //id + optional string username = 2; //username + optional string passwordHash = 3; //passwordHash + optional string phone = 4; //phone + optional string email = 5; //email + optional string nickname = 6; //nickname + optional string avatar = 7; //avatar + optional string bio = 8; //bio + optional string currentRole = 9; //currentRole + repeated string verifiedRoles = 10; //verifiedRoles + optional string verificationStatus = 11; //verificationStatus + optional bool isAdmin = 12; //isAdmin + optional int64 createdAt = 13; //createdAt + optional int64 updatedAt = 14; //updatedAt + optional int64 deletedAt = 15; //deletedAt } message UpdateUsersResp { @@ -73,19 +85,23 @@ message GetUsersByIdResp { } message SearchUsersReq { - int64 page = 1; //page - int64 limit = 2; //limit - int64 userId = 3; //userId - string username = 4; //username - string passwd = 5; //passwd - string nickname = 6; //nickname - string phone = 7; //phone - int64 roleType = 8; //roleType - bool isVerified = 9; //isVerified - bool state = 10; //state - int64 createdAt = 11; //createdAt - int64 updatedAt = 12; //updatedAt - int64 deletedAt = 13; //deletedAt + optional int64 page = 1; //page + optional int64 limit = 2; //limit + optional int64 id = 3; //id + optional string username = 4; //username + optional string passwordHash = 5; //passwordHash + optional string phone = 6; //phone + optional string email = 7; //email + optional string nickname = 8; //nickname + optional string avatar = 9; //avatar + optional string bio = 10; //bio + optional string currentRole = 11; //currentRole + repeated string verifiedRoles = 12; //verifiedRoles + optional string verificationStatus = 13; //verificationStatus + optional bool isAdmin = 14; //isAdmin + optional int64 createdAt = 15; //createdAt + optional int64 updatedAt = 16; //updatedAt + optional int64 deletedAt = 17; //deletedAt } message SearchUsersResp { @@ -121,7 +137,7 @@ message ValidateTokenResp { bool valid = 1; // token 是否有效（不在黑名单中） string message = 2; // 验证失败原因 int64 userId = 3; // 用户ID - int64 roleType = 4; // 用户角色 + string roleType = 4; // 用户角色 } message CheckPermissionReq { @@ -156,7 +172,17 @@ message LogoutResp { } -// ------------------------------------ +message ResetPasswordReq { + string newPassword = 1; + string email = 2; + string requestId = 3; + string vcode = 4; +} + +message ResetPasswordResp { + +} +// ------------------------------------ // Rpc Func // ------------------------------------ @@ -174,4 +200,5 @@ service usercenter { rpc ValidateToken(ValidateTokenReq) returns (ValidateTokenResp); rpc CheckPermission(CheckPermissionReq) returns (CheckPermissionResp); rpc Logout(LogoutReq) returns (LogoutResp); -} \ No newline at end of file + rpc ResetPassword(ResetPasswordReq) returns (ResetPasswordResp); +} diff --git a/desc/sql/users.sql b/desc/sql/users.sql deleted file mode 100644 index ad0ad42..0000000 --- a/desc/sql/users.sql +++ /dev/null @@ -1,20 +0,0 @@ --- create --- extension if not exists "uuid-ossp"; -create - extension if not exists "pg_trgm"; - -create table users -( - user_id BIGINT primary key not null, - username VARCHAR(50) UNIQUE NOT NULL, - passwd VARCHAR(255) NOT NULL, - nickname VARCHAR(50) NOT NULL DEFAULT ('user_' || substr(md5(random()::text), 1, 10)), - phone VARCHAR(20) UNIQUE NOT NULL default '', - email varchar(50) unique not null default '', - role_type SMALLINT NOT NULL default 1, -- 1:玩家, 2:打手, 3:店长 - is_verified BOOLEAN DEFAULT false, - state BOOLEAN NOT NULL DEFAULT true, - created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, - updated_at timestamp with time zone default current_timestamp, - deleted_at timestamp with time zone -); \ No newline at end of file diff --git a/desc/sql/users/user_verifications.sql b/desc/sql/users/user_verifications.sql new file mode 100644 index 0000000..1ebcd0e --- /dev/null +++ b/desc/sql/users/user_verifications.sql @@ -0,0 +1,35 @@ +CREATE TABLE user_verifications ( + id BIGINT PRIMARY KEY, + user_id BIGINT NOT NULL REFERENCES users(id), + role VARCHAR(20) NOT NULL, + status VARCHAR(20) NOT NULL DEFAULT 'pending', + materials JSONB NOT NULL, + reject_reason TEXT, + reviewed_by BIGINT, + reviewed_at TIMESTAMPTZ, + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + + CONSTRAINT chk_verification_status CHECK (status IN ('pending', 'approved', 'rejected')), + UNIQUE(user_id, role) -- 每个角色只有一条最新的认证记录 +); + +-- Note：Auto update verification_status of users table +CREATE OR REPLACE FUNCTION sync_user_verification_status() +RETURNS TRIGGER AS $$ +DECLARE +status_json JSONB; +BEGIN +SELECT jsonb_object_agg(role, status) +INTO status_json +FROM user_verifications +WHERE user_id = NEW.user_id; + +UPDATE users SET verification_status = status_json WHERE id = NEW.user_id; +RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER trigger_sync_verifications + AFTER INSERT OR UPDATE ON user_verifications + FOR EACH ROW EXECUTE FUNCTION sync_user_verification_status(); \ No newline at end of file diff --git a/desc/sql/users/users.sql b/desc/sql/users/users.sql new file mode 100644 index 0000000..2b1e288 --- /dev/null +++ b/desc/sql/users/users.sql @@ -0,0 +1,29 @@ +CREATE EXTENSION IF NOT EXISTS pg_trgm; -- 三元组模糊搜索 +CREATE EXTENSION IF NOT EXISTS btree_gin; -- 复合 GIN 索引 +CREATE EXTENSION IF NOT EXISTS pgcrypto; -- 加密函数 + +CREATE TABLE users +( + id BIGINT PRIMARY KEY, + username VARCHAR(50) UNIQUE NOT NULL, + password_hash VARCHAR(255) NOT NULL, + phone VARCHAR(20) UNIQUE, + email VARCHAR(100) UNIQUE, + nickname VARCHAR(100) NOT NULL, + avatar TEXT, + bio TEXT, + "current_role" VARCHAR(20) NOT NULL DEFAULT 'consumer', + verified_roles TEXT[] DEFAULT ARRAY ['consumer']::TEXT[], + -- 结构: {"player": "pending", "owner": "rejected", "consumer": "approved"} + verification_status JSONB DEFAULT '{"consumer": "approved"}'::JSONB, + is_admin BOOLEAN DEFAULT FALSE, + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + deleted_at TIMESTAMPTZ, + + CONSTRAINT chk_current_role CHECK (current_role IN ('consumer', 'player', 'owner', 'admin')) +); + +-- 索引 +CREATE INDEX idx_users_phone ON users (phone) WHERE deleted_at IS NULL; +CREATE INDEX idx_users_username_trgm ON users USING gin (username gin_trgm_ops) WHERE deleted_at IS NULL; diff --git a/go.mod b/go.mod index 31a21d3..0c418f8 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module juwan-backend go 1.25.1 require ( + entgo.io/ent v0.14.5 github.com/envoyproxy/go-control-plane/envoy v1.36.0 github.com/golang-jwt/jwt/v4 v4.5.2 github.com/google/uuid v1.6.0 @@ -17,8 +18,13 @@ require ( ) require ( + ariga.io/atlas v0.32.1-0.20250325101103-175b25e1c1b9 // indirect + ariga.io/entcache v0.1.0 // indirect filippo.io/edwards25519 v1.1.1 // indirect + github.com/agext/levenshtein v1.2.3 // indirect + github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/bmatcuk/doublestar v1.3.4 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect @@ -31,11 +37,14 @@ require ( github.com/fatih/color v1.18.0 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-openapi/inflect v0.19.0 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.4 // indirect + github.com/go-redis/redis/v8 v8.11.3 // indirect github.com/go-sql-driver/mysql v1.9.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.7.0 // indirect @@ -43,12 +52,16 @@ require ( github.com/grafana/pyroscope-go v1.2.7 // indirect github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect + github.com/hashicorp/hcl/v2 v2.18.1 // indirect + github.com/jinzhu/copier v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.18.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/mitchellh/hashstructure v1.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect @@ -62,6 +75,8 @@ require ( github.com/prometheus/procfs v0.16.1 // indirect github.com/segmentio/kafka-go v0.4.47 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect + github.com/zclconf/go-cty v1.14.4 // indirect + github.com/zclconf/go-cty-yaml v1.1.0 // indirect go.etcd.io/etcd/api/v3 v3.5.15 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect go.etcd.io/etcd/client/v3 v3.5.15 // indirect @@ -82,6 +97,7 @@ require ( go.uber.org/multierr v1.9.0 // indirect go.uber.org/zap v1.24.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect + golang.org/x/mod v0.30.0 // indirect golang.org/x/net v0.48.0 // indirect golang.org/x/oauth2 v0.34.0 // indirect golang.org/x/sys v0.39.0 // indirect diff --git a/go.sum b/go.sum index 1fa1f41..7a39949 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,32 @@ -filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= -filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +ariga.io/atlas v0.32.1-0.20250325101103-175b25e1c1b9 h1:E0wvcUXTkgyN4wy4LGtNzMNGMytJN8afmIWXJVMi4cc= +ariga.io/atlas v0.32.1-0.20250325101103-175b25e1c1b9/go.mod h1:Oe1xWPuu5q9LzyrWfbZmEZxFYeu4BHTyzfjeW2aZp/w= +ariga.io/entcache v0.1.0 h1:nfJXzjB5CEvAK6SmjupHREMJrKLakeqU5tG3s4TO6JA= +ariga.io/entcache v0.1.0/go.mod h1:3Z1Sql5bcqPA1YV/jvMlZyh9T+ntSFOclaASAm1TiKQ= +entgo.io/ent v0.14.5 h1:Rj2WOYJtCkWyFo6a+5wB3EfBRP0rnx1fMk6gGA0UUe4= +entgo.io/ent v0.14.5/go.mod h1:zTzLmWtPvGpmSwtkaayM2cm5m819NdM7z7tYPq3vN0U= filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw= filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= +github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= +github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/alicebob/miniredis/v2 v2.36.1 h1:Dvc5oAnNOr7BIfPn7tF269U8DvRW1dBG2D5n0WrfYMI= github.com/alicebob/miniredis/v2 v2.36.1/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM= +github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= +github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0= +github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 h1:6xNmx7iTtyBRev0+D/Tv1FZd4SCg8axKApyNyRsAt/w= @@ -38,12 +49,16 @@ github.com/envoyproxy/protoc-gen-validate v1.3.0 h1:TvGH1wof4H33rezVKWSpqKz5NXWg github.com/envoyproxy/protoc-gen-validate v1.3.0/go.mod h1:HvYl7zwPa5mffgyeTUHA9zHIH36nmrm7oCbo4YKoSWA= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4= +github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= @@ -51,19 +66,40 @@ github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-redis/redis/v8 v8.11.3 h1:GCjoYp8c+yQTJfc0n69iwSiHjvuAdruxl7elnZCxgt8= +github.com/go-redis/redis/v8 v8.11.3/go.mod h1:xNJ9xDG09FsIPwh3bWdk+0oDWHbtF9rPN0F/oD9XeKc= github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo= github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= +github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= @@ -82,6 +118,13 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+u github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= +github.com/hashicorp/hcl/v2 v2.18.1 h1:6nxnOJFku1EuSawSD81fuviYUV8DxFr3fp2dUi3ZYSo= +github.com/hashicorp/hcl/v2 v2.18.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= +github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -109,6 +152,14 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= 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.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= +github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= +github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= +github.com/mitchellh/hashstructure v1.1.0 h1:P6P1hdjqAAknpY/M1CGipelZgp+4y9ja9kmUZPXP+H0= +github.com/mitchellh/hashstructure v1.1.0/go.mod h1:xUDAozZz0Wmdiufv0uyhnHkUTN6/6d8ulp4AwfLKrmA= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -116,8 +167,18 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg= @@ -145,12 +206,18 @@ github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzM github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= github.com/redis/go-redis/v9 v9.17.3 h1:fN29NdNrE17KttK5Ndf20buqfDZwGNgoUr9qjl1DQx4= github.com/redis/go-redis/v9 v9.17.3/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/segmentio/kafka-go v0.4.47 h1:IqziR4pA3vrZq7YdRxaT3w1/5fvIH5qpCwstUanQQB0= github.com/segmentio/kafka-go v0.4.47/go.mod h1:HjF6XbOKh0Pjlkr5GVZxt6CsjjwnmhVOfURM5KMd8qg= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -159,6 +226,7 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= @@ -176,6 +244,10 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= +github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8= +github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +github.com/zclconf/go-cty-yaml v1.1.0 h1:nP+jp0qPHv2IhUVqmQSzjvqAWcObN0KBkUl2rWBdig0= +github.com/zclconf/go-cty-yaml v1.1.0/go.mod h1:9YLUH4g7lOhVWqUbctnVlZ5KLpg7JAprQNgxSZ1Gyxs= github.com/zeromicro/go-queue v1.2.2 h1:3TMhRlI/8lZy13Sj6FBBWWRXlsQhGCchRxY2itfV1Is= github.com/zeromicro/go-queue v1.2.2/go.mod h1:5HiNTEw1tACi9itho0JYQ1+EpIGpSFM4tOQ4bit+yKM= github.com/zeromicro/go-zero v1.10.0 h1:+qfAqj+BGt0qjW1PQk2VO5WLwIQBh60CA3OTLsBosS8= @@ -235,11 +307,16 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk= +golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= @@ -248,15 +325,25 @@ golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU= golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY= golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw= golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= +golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -276,6 +363,7 @@ golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q= golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= @@ -288,6 +376,7 @@ golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= @@ -305,16 +394,29 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.79.1 h1:zGhSi45ODB9/p3VAawt9a+O/MULLl9dpizzNNpq7flY= google.golang.org/grpc v1.79.1/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY= gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/package-lock.json b/package-lock.json index 865565a..0ebc9e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "fuse.js": "^7.1.0", "glob": "^13.0.1", "hereby": "^1.11.1", + "postgres": "^3.4.8", "prompts": "^2.4.2" }, "devDependencies": { @@ -886,6 +887,19 @@ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "license": "ISC" }, + "node_modules/postgres": { + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/postgres/-/postgres-3.4.8.tgz", + "integrity": "sha512-d+JFcLM17njZaOLkv6SCev7uoLaBtfK86vMUXhW1Z4glPWh4jozno9APvW/XKFJ3CCxVoC7OL38BqRydtu5nGg==", + "license": "Unlicense", + "engines": { + "node": ">=12" + }, + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/porsager" + } + }, "node_modules/pretty-ms": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-8.0.0.tgz", diff --git a/package.json b/package.json index 8f637b2..af724e4 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "fuse.js": "^7.1.0", "glob": "^13.0.1", "hereby": "^1.11.1", + "postgres": "^3.4.8", "prompts": "^2.4.2" }, "devDependencies": { diff --git a/pkg/adapter/redis_cache.go b/pkg/adapter/redis_cache.go new file mode 100644 index 0000000..da7d109 --- /dev/null +++ b/pkg/adapter/redis_cache.go @@ -0,0 +1,62 @@ +package adapter + +import ( + "bytes" + "context" + "encoding/gob" + "errors" + "fmt" + "time" + + "ariga.io/entcache" + "github.com/redis/go-redis/v9" +) + +type RedisCache struct { + redis *redis.ClusterClient +} + +func NewRedisCache(redis *redis.ClusterClient) *RedisCache { + return &RedisCache{redis: redis} +} + +func (c *RedisCache) Del(ctx context.Context, key entcache.Key) error { + if k, ok := key.(string); !ok { + return fmt.Errorf("key is not a string") + } else { + c.redis.Del(ctx, k) + return nil + } +} + +func (c *RedisCache) Add(ctx context.Context, key entcache.Key, entry *entcache.Entry, duration time.Duration) error { + k, ok := key.(string) + if !ok { + return fmt.Errorf("key is not a string") + } + var buf bytes.Buffer + if err := gob.NewEncoder(&buf).Encode(entry); err != nil { + return fmt.Errorf("failed to encode entry: %w", err) + } + return c.redis.Set(ctx, k, buf.Bytes(), duration).Err() +} + +func (c *RedisCache) Get(ctx context.Context, key entcache.Key) (*entcache.Entry, error) { + k, ok := key.(string) + if !ok { + return nil, fmt.Errorf("key is not a string") + } + val, err := c.redis.Get(ctx, k).Bytes() + if err != nil { + if errors.Is(err, redis.Nil) { + // 缓存未命中 + return nil, nil + } + return nil, err + } + var entry entcache.Entry + if err := gob.NewDecoder(bytes.NewReader(val)).Decode(&entry); err != nil { + return nil, fmt.Errorf("failed to decode entry: %w", err) + } + return &entry, nil +}