add: user accomplished

2026-02-27 05:42:13 +08:00
parent 659168fe32
commit a0c720eb2f
90 changed files with 9592 additions and 1180 deletions
@@ -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
 }