Skip to content

Commit a7c82f7

Browse files
WashingtonKKdborovcanin
authored andcommitted
return error from service
Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>
1 parent 730b3c1 commit a7c82f7

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

users/api/grpc/endpoint.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,20 @@ func sendEmailEndpoint(svc users.Service) endpoint.Endpoint {
1717
return func(ctx context.Context, request any) (any, error) {
1818
req := request.(sendEmailReq)
1919
if err := req.validate(); err != nil {
20-
return sendEmailRes{}, err
20+
return sendEmailRes{
21+
err: err,
22+
}, err
2123
}
2224

2325
if err := svc.SendEmailWithUserId(ctx, req.to, req.from, req.subject, req.header, req.user, req.content, req.footer); err != nil {
24-
return sendEmailRes{}, err
26+
return sendEmailRes{
27+
err: err,
28+
}, err
2529
}
2630

27-
return sendEmailRes{sent: true}, nil
31+
return sendEmailRes{
32+
sent: true,
33+
}, nil
2834
}
2935
}
3036

@@ -65,4 +71,5 @@ func (req sendEmailReq) validate() error {
6571

6672
type sendEmailRes struct {
6773
sent bool
74+
err error
6875
}

users/api/grpc/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ func decodeSendEmailRequest(_ context.Context, grpcReq any) (any, error) {
6161
func encodeSendEmailResponse(_ context.Context, grpcRes any) (any, error) {
6262
res := grpcRes.(sendEmailRes)
6363
errMsg := ""
64-
if !res.sent {
65-
errMsg = "failed to send email"
64+
if !res.sent && res.err != nil {
65+
errMsg = res.err.Error()
6666
}
6767
return &grpcUsersV1.SendEmailRes{Error: errMsg}, nil
6868
}

0 commit comments

Comments
 (0)