Skip to content

Commit a3e5587

Browse files
naeemaeinaeemaei
authored
Merge branch 'master' into feature/add-refresh-token
2 parents 20eee13 + dfae5b0 commit a3e5587

20 files changed

+159
-166
lines changed

‎src/api/handler/user.go‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,14 @@ import (
1313
)
1414

1515
type UsersHandler struct {
16-
usecase *usecase.UserUsecase
17-
otpUsecase *usecase.OtpUsecase
18-
tokenUsecase *usecase.TokenUsecase
19-
config *config.Config
16+
userUsecase *usecase.UserUsecase
17+
otpUsecase *usecase.OtpUsecase
2018
}
2119

2220
func NewUserHandler(cfg *config.Config) *UsersHandler {
23-
tokenUsecase := usecase.NewTokenUsecase(cfg)
24-
usecase := usecase.NewUserUsecase(cfg, dependency.GetUserRepository(cfg))
25-
26-
return &UsersHandler{
27-
usecase: usecase,
28-
tokenUsecase: tokenUsecase,
29-
config: cfg,
30-
}
21+
userUsecase := usecase.NewUserUsecase(cfg, dependency.GetUserRepository(cfg))
22+
otpUsecase := usecase.NewOtpUsecase(cfg)
23+
return &UsersHandler{userUsecase: userUsecase, otpUsecase: otpUsecase}
3124
}
3225

3326
// LoginByUsername godoc
@@ -49,7 +42,7 @@ func (h *UsersHandler) LoginByUsername(c *gin.Context) {
4942
helper.GenerateBaseResponseWithValidationError(nil, false, helper.ValidationError, err))
5043
return
5144
}
52-
token, err := h.usecase.LoginByUsername(c, req.Username, req.Password)
45+
token, err := h.userUsecase.LoginByUsername(c, req.Username, req.Password)
5346
if err != nil {
5447
c.AbortWithStatusJSON(helper.TranslateErrorToStatusCode(err),
5548
helper.GenerateBaseResponseWithError(nil, false, helper.InternalError, err))
@@ -81,7 +74,7 @@ func (h *UsersHandler) RegisterByUsername(c *gin.Context) {
8174
helper.GenerateBaseResponseWithValidationError(nil, false, helper.ValidationError, err))
8275
return
8376
}
84-
err = h.usecase.RegisterByUsername(c, req.ToRegisterUserByUsername())
77+
err = h.userUsecase.RegisterByUsername(c, req.ToRegisterUserByUsername())
8578
if err != nil {
8679
c.AbortWithStatusJSON(helper.TranslateErrorToStatusCode(err),
8780
helper.GenerateBaseResponseWithError(nil, false, helper.InternalError, err))
@@ -110,7 +103,7 @@ func (h *UsersHandler) RegisterLoginByMobileNumber(c *gin.Context) {
110103
helper.GenerateBaseResponseWithValidationError(nil, false, helper.ValidationError, err))
111104
return
112105
}
113-
token, err := h.usecase.RegisterAndLoginByMobileNumber(c, req.MobileNumber, req.Otp)
106+
token, err := h.userUsecase.RegisterAndLoginByMobileNumber(c, req.MobileNumber, req.Otp)
114107
if err != nil {
115108
c.AbortWithStatusJSON(helper.TranslateErrorToStatusCode(err),
116109
helper.GenerateBaseResponseWithError(nil, false, helper.InternalError, err))

‎src/usecase/carModelColor_usecase.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func (u *CarModelColorUsecase) Create(ctx context.Context, req dto.CreateCarMode
2626
}
2727

2828
// Update
29-
func (s *CarModelColorUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelColor) (dto.CarModelColor, error) {
30-
return s.base.Update(ctx, id, req)
29+
func (u *CarModelColorUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelColor) (dto.CarModelColor, error) {
30+
return u.base.Update(ctx, id, req)
3131
}
3232

3333
// Delete
34-
func (s *CarModelColorUsecase) Delete(ctx context.Context, id int) error {
35-
return s.base.Delete(ctx, id)
34+
func (u *CarModelColorUsecase) Delete(ctx context.Context, id int) error {
35+
return u.base.Delete(ctx, id)
3636
}
3737

3838
// Get By Id
39-
func (s *CarModelColorUsecase) GetById(ctx context.Context, id int) (dto.CarModelColor, error) {
40-
return s.base.GetById(ctx, id)
39+
func (u *CarModelColorUsecase) GetById(ctx context.Context, id int) (dto.CarModelColor, error) {
40+
return u.base.GetById(ctx, id)
4141
}
4242

4343
// Get By Filter
44-
func (s *CarModelColorUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelColor], error) {
45-
return s.base.GetByFilter(ctx, req)
44+
func (u *CarModelColorUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelColor], error) {
45+
return u.base.GetByFilter(ctx, req)
4646
}

‎src/usecase/carModelComment_usecase.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func (u *CarModelCommentUsecase) Create(ctx context.Context, req dto.CreateCarMo
2626
}
2727

2828
// Update
29-
func (s *CarModelCommentUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelComment) (dto.CarModelComment, error) {
30-
return s.base.Update(ctx, id, req)
29+
func (u *CarModelCommentUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelComment) (dto.CarModelComment, error) {
30+
return u.base.Update(ctx, id, req)
3131
}
3232

3333
// Delete
34-
func (s *CarModelCommentUsecase) Delete(ctx context.Context, id int) error {
35-
return s.base.Delete(ctx, id)
34+
func (u *CarModelCommentUsecase) Delete(ctx context.Context, id int) error {
35+
return u.base.Delete(ctx, id)
3636
}
3737

3838
// Get By Id
39-
func (s *CarModelCommentUsecase) GetById(ctx context.Context, id int) (dto.CarModelComment, error) {
40-
return s.base.GetById(ctx, id)
39+
func (u *CarModelCommentUsecase) GetById(ctx context.Context, id int) (dto.CarModelComment, error) {
40+
return u.base.GetById(ctx, id)
4141
}
4242

4343
// Get By Filter
44-
func (s *CarModelCommentUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelComment], error) {
45-
return s.base.GetByFilter(ctx, req)
44+
func (u *CarModelCommentUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelComment], error) {
45+
return u.base.GetByFilter(ctx, req)
4646
}

‎src/usecase/carModelImage_usecase.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func (u *CarModelImageUsecase) Create(ctx context.Context, req dto.CreateCarMode
2626
}
2727

2828
// Update
29-
func (s *CarModelImageUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelImage) (dto.CarModelImage, error) {
30-
return s.base.Update(ctx, id, req)
29+
func (u *CarModelImageUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelImage) (dto.CarModelImage, error) {
30+
return u.base.Update(ctx, id, req)
3131
}
3232

3333
// Delete
34-
func (s *CarModelImageUsecase) Delete(ctx context.Context, id int) error {
35-
return s.base.Delete(ctx, id)
34+
func (u *CarModelImageUsecase) Delete(ctx context.Context, id int) error {
35+
return u.base.Delete(ctx, id)
3636
}
3737

3838
// Get By Id
39-
func (s *CarModelImageUsecase) GetById(ctx context.Context, id int) (dto.CarModelImage, error) {
40-
return s.base.GetById(ctx, id)
39+
func (u *CarModelImageUsecase) GetById(ctx context.Context, id int) (dto.CarModelImage, error) {
40+
return u.base.GetById(ctx, id)
4141
}
4242

4343
// Get By Filter
44-
func (s *CarModelImageUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelImage], error) {
45-
return s.base.GetByFilter(ctx, req)
44+
func (u *CarModelImageUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelImage], error) {
45+
return u.base.GetByFilter(ctx, req)
4646
}

‎src/usecase/carModelPriceHistory_usecase.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func (u *CarModelPriceHistoryUsecase) Create(ctx context.Context, req dto.Create
2626
}
2727

2828
// Update
29-
func (s *CarModelPriceHistoryUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelPriceHistory) (dto.CarModelPriceHistory, error) {
30-
return s.base.Update(ctx, id, req)
29+
func (u *CarModelPriceHistoryUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelPriceHistory) (dto.CarModelPriceHistory, error) {
30+
return u.base.Update(ctx, id, req)
3131
}
3232

3333
// Delete
34-
func (s *CarModelPriceHistoryUsecase) Delete(ctx context.Context, id int) error {
35-
return s.base.Delete(ctx, id)
34+
func (u *CarModelPriceHistoryUsecase) Delete(ctx context.Context, id int) error {
35+
return u.base.Delete(ctx, id)
3636
}
3737

3838
// Get By Id
39-
func (s *CarModelPriceHistoryUsecase) GetById(ctx context.Context, id int) (dto.CarModelPriceHistory, error) {
40-
return s.base.GetById(ctx, id)
39+
func (u *CarModelPriceHistoryUsecase) GetById(ctx context.Context, id int) (dto.CarModelPriceHistory, error) {
40+
return u.base.GetById(ctx, id)
4141
}
4242

4343
// Get By Filter
44-
func (s *CarModelPriceHistoryUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelPriceHistory], error) {
45-
return s.base.GetByFilter(ctx, req)
44+
func (u *CarModelPriceHistoryUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelPriceHistory], error) {
45+
return u.base.GetByFilter(ctx, req)
4646
}

‎src/usecase/carModelProperty_usecase.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func (u *CarModelPropertyUsecase) Create(ctx context.Context, req dto.CreateCarM
2626
}
2727

2828
// Update
29-
func (s *CarModelPropertyUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelProperty) (dto.CarModelProperty, error) {
30-
return s.base.Update(ctx, id, req)
29+
func (u *CarModelPropertyUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelProperty) (dto.CarModelProperty, error) {
30+
return u.base.Update(ctx, id, req)
3131
}
3232

3333
// Delete
34-
func (s *CarModelPropertyUsecase) Delete(ctx context.Context, id int) error {
35-
return s.base.Delete(ctx, id)
34+
func (u *CarModelPropertyUsecase) Delete(ctx context.Context, id int) error {
35+
return u.base.Delete(ctx, id)
3636
}
3737

3838
// Get By Id
39-
func (s *CarModelPropertyUsecase) GetById(ctx context.Context, id int) (dto.CarModelProperty, error) {
40-
return s.base.GetById(ctx, id)
39+
func (u *CarModelPropertyUsecase) GetById(ctx context.Context, id int) (dto.CarModelProperty, error) {
40+
return u.base.GetById(ctx, id)
4141
}
4242

4343
// Get By Filter
44-
func (s *CarModelPropertyUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelProperty], error) {
45-
return s.base.GetByFilter(ctx, req)
44+
func (u *CarModelPropertyUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelProperty], error) {
45+
return u.base.GetByFilter(ctx, req)
4646
}

‎src/usecase/carModelYear_usecase.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func (u *CarModelYearUsecase) Create(ctx context.Context, req dto.CreateCarModel
2626
}
2727

2828
// Update
29-
func (s *CarModelYearUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelYear) (dto.CarModelYear, error) {
30-
return s.base.Update(ctx, id, req)
29+
func (u *CarModelYearUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelYear) (dto.CarModelYear, error) {
30+
return u.base.Update(ctx, id, req)
3131
}
3232

3333
// Delete
34-
func (s *CarModelYearUsecase) Delete(ctx context.Context, id int) error {
35-
return s.base.Delete(ctx, id)
34+
func (u *CarModelYearUsecase) Delete(ctx context.Context, id int) error {
35+
return u.base.Delete(ctx, id)
3636
}
3737

3838
// Get By Id
39-
func (s *CarModelYearUsecase) GetById(ctx context.Context, id int) (dto.CarModelYear, error) {
40-
return s.base.GetById(ctx, id)
39+
func (u *CarModelYearUsecase) GetById(ctx context.Context, id int) (dto.CarModelYear, error) {
40+
return u.base.GetById(ctx, id)
4141
}
4242

4343
// Get By Filter
44-
func (s *CarModelYearUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelYear], error) {
45-
return s.base.GetByFilter(ctx, req)
44+
func (u *CarModelYearUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelYear], error) {
45+
return u.base.GetByFilter(ctx, req)
4646
}

‎src/usecase/carModel_usecase.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func (u *CarModelUsecase) Create(ctx context.Context, req dto.CreateCarModel) (d
2626
}
2727

2828
// Update
29-
func (s *CarModelUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModel) (dto.CarModel, error) {
30-
return s.base.Update(ctx, id, req)
29+
func (u *CarModelUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModel) (dto.CarModel, error) {
30+
return u.base.Update(ctx, id, req)
3131
}
3232

3333
// Delete
34-
func (s *CarModelUsecase) Delete(ctx context.Context, id int) error {
35-
return s.base.Delete(ctx, id)
34+
func (u *CarModelUsecase) Delete(ctx context.Context, id int) error {
35+
return u.base.Delete(ctx, id)
3636
}
3737

3838
// Get By Id
39-
func (s *CarModelUsecase) GetById(ctx context.Context, id int) (dto.CarModel, error) {
40-
return s.base.GetById(ctx, id)
39+
func (u *CarModelUsecase) GetById(ctx context.Context, id int) (dto.CarModel, error) {
40+
return u.base.GetById(ctx, id)
4141
}
4242

4343
// Get By Filter
44-
func (s *CarModelUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModel], error) {
45-
return s.base.GetByFilter(ctx, req)
44+
func (u *CarModelUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModel], error) {
45+
return u.base.GetByFilter(ctx, req)
4646
}

‎src/usecase/carType_usecase.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func (u *CarTypeUsecase) Create(ctx context.Context, req dto.Name) (dto.IdName,
2626
}
2727

2828
// Update
29-
func (s *CarTypeUsecase) Update(ctx context.Context, id int, req dto.Name) (dto.IdName, error) {
30-
return s.base.Update(ctx, id, req)
29+
func (u *CarTypeUsecase) Update(ctx context.Context, id int, req dto.Name) (dto.IdName, error) {
30+
return u.base.Update(ctx, id, req)
3131
}
3232

3333
// Delete
34-
func (s *CarTypeUsecase) Delete(ctx context.Context, id int) error {
35-
return s.base.Delete(ctx, id)
34+
func (u *CarTypeUsecase) Delete(ctx context.Context, id int) error {
35+
return u.base.Delete(ctx, id)
3636
}
3737

3838
// Get By Id
39-
func (s *CarTypeUsecase) GetById(ctx context.Context, id int) (dto.IdName, error) {
40-
return s.base.GetById(ctx, id)
39+
func (u *CarTypeUsecase) GetById(ctx context.Context, id int) (dto.IdName, error) {
40+
return u.base.GetById(ctx, id)
4141
}
4242

4343
// Get By Filter
44-
func (s *CarTypeUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.IdName], error) {
45-
return s.base.GetByFilter(ctx, req)
44+
func (u *CarTypeUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.IdName], error) {
45+
return u.base.GetByFilter(ctx, req)
4646
}

‎src/usecase/city_usecase.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func (u *CityUsecase) Create(ctx context.Context, req dto.CreateCity) (dto.City,
2626
}
2727

2828
// Update
29-
func (s *CityUsecase) Update(ctx context.Context, id int, req dto.UpdateCity) (dto.City, error) {
30-
return s.base.Update(ctx, id, req)
29+
func (u *CityUsecase) Update(ctx context.Context, id int, req dto.UpdateCity) (dto.City, error) {
30+
return u.base.Update(ctx, id, req)
3131
}
3232

3333
// Delete
34-
func (s *CityUsecase) Delete(ctx context.Context, id int) error {
35-
return s.base.Delete(ctx, id)
34+
func (u *CityUsecase) Delete(ctx context.Context, id int) error {
35+
return u.base.Delete(ctx, id)
3636
}
3737

3838
// Get By Id
39-
func (s *CityUsecase) GetById(ctx context.Context, id int) (dto.City, error) {
40-
return s.base.GetById(ctx, id)
39+
func (u *CityUsecase) GetById(ctx context.Context, id int) (dto.City, error) {
40+
return u.base.GetById(ctx, id)
4141
}
4242

4343
// Get By Filter
44-
func (s *CityUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.City], error) {
45-
return s.base.GetByFilter(ctx, req)
44+
func (u *CityUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.City], error) {
45+
return u.base.GetByFilter(ctx, req)
4646
}

0 commit comments

Comments
 (0)