diff --git a/api/reservation/reservation.go b/api/reservation/reservation.go index bf5e722..c26c719 100644 --- a/api/reservation/reservation.go +++ b/api/reservation/reservation.go @@ -8,9 +8,10 @@ import ( "context" "practice_Go/api/reservation/v1" + "practice_Go/internal/model/dto" ) type IReservationV1 interface { - AddReservation(ctx context.Context, req *v1.AddReservationReq) (res *v1.AddReservationRes, err error) - DeleteReservation(ctx context.Context, req *v1.DeleteReservationReq) (res *v1.DeleteReservationRes, err error) + AddReservation(ctx context.Context, req *v1.AddReservationReq) (*dto.Result, error) + DeleteReservation(ctx context.Context, req *v1.DeleteReservationReq) (*dto.Result, error) } diff --git a/api/subscription/subscription.go b/api/subscription/subscription.go index 9d132d1..4e8b97e 100644 --- a/api/subscription/subscription.go +++ b/api/subscription/subscription.go @@ -8,9 +8,10 @@ import ( "context" "practice_Go/api/subscription/v1" + "practice_Go/internal/model/dto" ) type ISubscriptionV1 interface { - AddSubscription(ctx context.Context, req *v1.AddSubscriptionReq) (res *v1.AddSubscriptionRes, err error) - DeleteSubscription(ctx context.Context, req *v1.DeleteSubscriptionReq) (res *v1.DeleteSubscriptionRes, err error) + AddSubscription(ctx context.Context, req *v1.AddSubscriptionReq) (*dto.Result, error) + DeleteSubscription(ctx context.Context, req *v1.DeleteSubscriptionReq) (*dto.Result, error) } diff --git a/internal/controller/reservation/reservation_v1_add_reservation.go b/internal/controller/reservation/reservation_v1_add_reservation.go index 8f7f89a..d1eb781 100644 --- a/internal/controller/reservation/reservation_v1_add_reservation.go +++ b/internal/controller/reservation/reservation_v1_add_reservation.go @@ -6,16 +6,18 @@ import ( "practice_Go/api/reservation/v1" "practice_Go/internal/dao" "practice_Go/internal/model/do" + "practice_Go/internal/model/dto" ) -func (c *ControllerV1) AddReservation(ctx context.Context, req *v1.AddReservationReq) (res *v1.AddReservationRes, err error) { - res = &v1.AddReservationRes{} - _, err = dao.GoLiveReservations.Ctx(ctx).Data(do.GoLiveReservations{ +func (c *ControllerV1) AddReservation(ctx context.Context, req *v1.AddReservationReq) (*dto.Result, error) { + res := &v1.AddReservationRes{} + _, err := dao.GoLiveReservations.Ctx(ctx).Data(do.GoLiveReservations{ LiveId: req.Id, UserId: req.UserId, }).Insert() - if err == nil { - res.Success = true + if err != nil { + return dto.Error(err.Error()), nil } - return + res.Success = true + return dto.SuccessWithData(res), nil } diff --git a/internal/controller/reservation/reservation_v1_delete_reservation.go b/internal/controller/reservation/reservation_v1_delete_reservation.go index 06f4042..4446cde 100644 --- a/internal/controller/reservation/reservation_v1_delete_reservation.go +++ b/internal/controller/reservation/reservation_v1_delete_reservation.go @@ -5,13 +5,15 @@ import ( "practice_Go/api/reservation/v1" "practice_Go/internal/dao" + "practice_Go/internal/model/dto" ) -func (c *ControllerV1) DeleteReservation(ctx context.Context, req *v1.DeleteReservationReq) (res *v1.DeleteReservationRes, err error) { - res = &v1.DeleteReservationRes{} - _, err = dao.GoLiveReservations.Ctx(ctx).Wheref("live_id =? and user_id =?", req.Id, req.UserId).Delete() - if err == nil { - res.Success = true +func (c *ControllerV1) DeleteReservation(ctx context.Context, req *v1.DeleteReservationReq) (*dto.Result, error) { + res := &v1.DeleteReservationRes{} + _, err := dao.GoLiveReservations.Ctx(ctx).Wheref("live_id =? and user_id =?", req.Id, req.UserId).Delete() + if err != nil { + return dto.Error(err.Error()), nil } - return + res.Success = true + return dto.SuccessWithData(res), nil } diff --git a/internal/controller/subscription/subscription_v1_add_subscription.go b/internal/controller/subscription/subscription_v1_add_subscription.go index 83b3bc6..85513b3 100644 --- a/internal/controller/subscription/subscription_v1_add_subscription.go +++ b/internal/controller/subscription/subscription_v1_add_subscription.go @@ -6,16 +6,18 @@ import ( "practice_Go/api/subscription/v1" "practice_Go/internal/dao" "practice_Go/internal/model/do" + "practice_Go/internal/model/dto" ) -func (c *ControllerV1) AddSubscription(ctx context.Context, req *v1.AddSubscriptionReq) (res *v1.AddSubscriptionRes, err error) { - res = &v1.AddSubscriptionRes{} - _, err = dao.GoChannelSubscriptions.Ctx(ctx).Data(do.GoChannelSubscriptions{ +func (c *ControllerV1) AddSubscription(ctx context.Context, req *v1.AddSubscriptionReq) (*dto.Result, error) { + res := v1.AddSubscriptionRes{} + _, err := dao.GoChannelSubscriptions.Ctx(ctx).Data(do.GoChannelSubscriptions{ ChannelId: req.Id, UserId: req.UserId, }).Insert() - if err == nil { - res.Success = true + if err != nil { + return dto.Error(err.Error()), nil } - return + res.Success = true + return dto.SuccessWithData(res), nil } diff --git a/internal/controller/subscription/subscription_v1_delete_subscription.go b/internal/controller/subscription/subscription_v1_delete_subscription.go index 40e0a31..5a85b90 100644 --- a/internal/controller/subscription/subscription_v1_delete_subscription.go +++ b/internal/controller/subscription/subscription_v1_delete_subscription.go @@ -5,13 +5,15 @@ import ( "practice_Go/api/subscription/v1" "practice_Go/internal/dao" + "practice_Go/internal/model/dto" ) -func (c *ControllerV1) DeleteSubscription(ctx context.Context, req *v1.DeleteSubscriptionReq) (res *v1.DeleteSubscriptionRes, err error) { - res = &v1.DeleteSubscriptionRes{} - _, err = dao.GoChannelSubscriptions.Ctx(ctx).Wheref("channel_id =? and user_id =?", req.Id, req.UserId).Delete() - if err == nil { - res.Success = true +func (c *ControllerV1) DeleteSubscription(ctx context.Context, req *v1.DeleteSubscriptionReq) (*dto.Result, error) { + res := &v1.DeleteSubscriptionRes{} + _, err := dao.GoChannelSubscriptions.Ctx(ctx).Wheref("channel_id =? and user_id =?", req.Id, req.UserId).Delete() + if err != nil { + return dto.Error(err.Error()), nil } - return + res.Success = true + return dto.SuccessWithData(res), nil }