diff --git a/src/api/handler/user.go b/src/api/handler/user.go
index 9d6329a..3eb15d1 100644
--- a/src/api/handler/user.go
+++ b/src/api/handler/user.go
@@ -12,13 +12,14 @@ import (
 )
 
 type UsersHandler struct {
-	usecase    *usecase.UserUsecase
+	userUsecase    *usecase.UserUsecase
 	otpUsecase *usecase.OtpUsecase
 }
 
 func NewUserHandler(cfg *config.Config) *UsersHandler {
-	usecase := usecase.NewUserUsecase(cfg, dependency.GetUserRepository(cfg))
-	return &UsersHandler{usecase: usecase}
+	userUsecase := usecase.NewUserUsecase(cfg, dependency.GetUserRepository(cfg))
+	otpUsecase := usecase.NewOtpUsecase(cfg)
+	return &UsersHandler{userUsecase: userUsecase, otpUsecase: otpUsecase}
 }
 
 // LoginByUsername godoc
@@ -40,7 +41,7 @@ func (h *UsersHandler) LoginByUsername(c *gin.Context) {
 			helper.GenerateBaseResponseWithValidationError(nil, false, helper.ValidationError, err))
 		return
 	}
-	token, err := h.usecase.LoginByUsername(c, req.Username, req.Password)
+	token, err := h.userUsecase.LoginByUsername(c, req.Username, req.Password)
 	if err != nil {
 		c.AbortWithStatusJSON(helper.TranslateErrorToStatusCode(err),
 			helper.GenerateBaseResponseWithError(nil, false, helper.InternalError, err))
@@ -69,7 +70,7 @@ func (h *UsersHandler) RegisterByUsername(c *gin.Context) {
 			helper.GenerateBaseResponseWithValidationError(nil, false, helper.ValidationError, err))
 		return
 	}
-	err = h.usecase.RegisterByUsername(c, req.ToRegisterUserByUsername())
+	err = h.userUsecase.RegisterByUsername(c, req.ToRegisterUserByUsername())
 	if err != nil {
 		c.AbortWithStatusJSON(helper.TranslateErrorToStatusCode(err),
 			helper.GenerateBaseResponseWithError(nil, false, helper.InternalError, err))
@@ -98,7 +99,7 @@ func (h *UsersHandler) RegisterLoginByMobileNumber(c *gin.Context) {
 			helper.GenerateBaseResponseWithValidationError(nil, false, helper.ValidationError, err))
 		return
 	}
-	token, err := h.usecase.RegisterAndLoginByMobileNumber(c, req.MobileNumber, req.Otp)
+	token, err := h.userUsecase.RegisterAndLoginByMobileNumber(c, req.MobileNumber, req.Otp)
 	if err != nil {
 		c.AbortWithStatusJSON(helper.TranslateErrorToStatusCode(err),
 			helper.GenerateBaseResponseWithError(nil, false, helper.InternalError, err))
diff --git a/src/usecase/carModelColor_usecase.go b/src/usecase/carModelColor_usecase.go
index b277860..8889fc3 100644
--- a/src/usecase/carModelColor_usecase.go
+++ b/src/usecase/carModelColor_usecase.go
@@ -26,21 +26,21 @@ func (u *CarModelColorUsecase) Create(ctx context.Context, req dto.CreateCarMode
 }
 
 // Update
-func (s *CarModelColorUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelColor) (dto.CarModelColor, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CarModelColorUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelColor) (dto.CarModelColor, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CarModelColorUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CarModelColorUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CarModelColorUsecase) GetById(ctx context.Context, id int) (dto.CarModelColor, error) {
-	return s.base.GetById(ctx, id)
+func (u *CarModelColorUsecase) GetById(ctx context.Context, id int) (dto.CarModelColor, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CarModelColorUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelColor], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CarModelColorUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelColor], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/carModelComment_usecase.go b/src/usecase/carModelComment_usecase.go
index 5c0bfcc..1bd7864 100644
--- a/src/usecase/carModelComment_usecase.go
+++ b/src/usecase/carModelComment_usecase.go
@@ -26,21 +26,21 @@ func (u *CarModelCommentUsecase) Create(ctx context.Context, req dto.CreateCarMo
 }
 
 // Update
-func (s *CarModelCommentUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelComment) (dto.CarModelComment, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CarModelCommentUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelComment) (dto.CarModelComment, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CarModelCommentUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CarModelCommentUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CarModelCommentUsecase) GetById(ctx context.Context, id int) (dto.CarModelComment, error) {
-	return s.base.GetById(ctx, id)
+func (u *CarModelCommentUsecase) GetById(ctx context.Context, id int) (dto.CarModelComment, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CarModelCommentUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelComment], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CarModelCommentUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelComment], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/carModelImage_usecase.go b/src/usecase/carModelImage_usecase.go
index 29609cc..a7f8f87 100644
--- a/src/usecase/carModelImage_usecase.go
+++ b/src/usecase/carModelImage_usecase.go
@@ -26,21 +26,21 @@ func (u *CarModelImageUsecase) Create(ctx context.Context, req dto.CreateCarMode
 }
 
 // Update
-func (s *CarModelImageUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelImage) (dto.CarModelImage, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CarModelImageUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelImage) (dto.CarModelImage, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CarModelImageUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CarModelImageUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CarModelImageUsecase) GetById(ctx context.Context, id int) (dto.CarModelImage, error) {
-	return s.base.GetById(ctx, id)
+func (u *CarModelImageUsecase) GetById(ctx context.Context, id int) (dto.CarModelImage, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CarModelImageUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelImage], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CarModelImageUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelImage], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/carModelPriceHistory_usecase.go b/src/usecase/carModelPriceHistory_usecase.go
index db4cdb2..47866bb 100644
--- a/src/usecase/carModelPriceHistory_usecase.go
+++ b/src/usecase/carModelPriceHistory_usecase.go
@@ -26,21 +26,21 @@ func (u *CarModelPriceHistoryUsecase) Create(ctx context.Context, req dto.Create
 }
 
 // Update
-func (s *CarModelPriceHistoryUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelPriceHistory) (dto.CarModelPriceHistory, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CarModelPriceHistoryUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelPriceHistory) (dto.CarModelPriceHistory, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CarModelPriceHistoryUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CarModelPriceHistoryUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CarModelPriceHistoryUsecase) GetById(ctx context.Context, id int) (dto.CarModelPriceHistory, error) {
-	return s.base.GetById(ctx, id)
+func (u *CarModelPriceHistoryUsecase) GetById(ctx context.Context, id int) (dto.CarModelPriceHistory, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CarModelPriceHistoryUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelPriceHistory], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CarModelPriceHistoryUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelPriceHistory], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/carModelProperty_usecase.go b/src/usecase/carModelProperty_usecase.go
index 986d4d3..05d3206 100644
--- a/src/usecase/carModelProperty_usecase.go
+++ b/src/usecase/carModelProperty_usecase.go
@@ -26,21 +26,21 @@ func (u *CarModelPropertyUsecase) Create(ctx context.Context, req dto.CreateCarM
 }
 
 // Update
-func (s *CarModelPropertyUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelProperty) (dto.CarModelProperty, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CarModelPropertyUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelProperty) (dto.CarModelProperty, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CarModelPropertyUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CarModelPropertyUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CarModelPropertyUsecase) GetById(ctx context.Context, id int) (dto.CarModelProperty, error) {
-	return s.base.GetById(ctx, id)
+func (u *CarModelPropertyUsecase) GetById(ctx context.Context, id int) (dto.CarModelProperty, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CarModelPropertyUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelProperty], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CarModelPropertyUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelProperty], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/carModelYear_usecase.go b/src/usecase/carModelYear_usecase.go
index 759fba3..2a5541b 100644
--- a/src/usecase/carModelYear_usecase.go
+++ b/src/usecase/carModelYear_usecase.go
@@ -26,21 +26,21 @@ func (u *CarModelYearUsecase) Create(ctx context.Context, req dto.CreateCarModel
 }
 
 // Update
-func (s *CarModelYearUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelYear) (dto.CarModelYear, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CarModelYearUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModelYear) (dto.CarModelYear, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CarModelYearUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CarModelYearUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CarModelYearUsecase) GetById(ctx context.Context, id int) (dto.CarModelYear, error) {
-	return s.base.GetById(ctx, id)
+func (u *CarModelYearUsecase) GetById(ctx context.Context, id int) (dto.CarModelYear, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CarModelYearUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelYear], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CarModelYearUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModelYear], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/carModel_usecase.go b/src/usecase/carModel_usecase.go
index 2630cd4..da5c251 100644
--- a/src/usecase/carModel_usecase.go
+++ b/src/usecase/carModel_usecase.go
@@ -26,21 +26,21 @@ func (u *CarModelUsecase) Create(ctx context.Context, req dto.CreateCarModel) (d
 }
 
 // Update
-func (s *CarModelUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModel) (dto.CarModel, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CarModelUsecase) Update(ctx context.Context, id int, req dto.UpdateCarModel) (dto.CarModel, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CarModelUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CarModelUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CarModelUsecase) GetById(ctx context.Context, id int) (dto.CarModel, error) {
-	return s.base.GetById(ctx, id)
+func (u *CarModelUsecase) GetById(ctx context.Context, id int) (dto.CarModel, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CarModelUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModel], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CarModelUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.CarModel], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/carType_usecase.go b/src/usecase/carType_usecase.go
index f069bcb..a5d49eb 100644
--- a/src/usecase/carType_usecase.go
+++ b/src/usecase/carType_usecase.go
@@ -26,21 +26,21 @@ func (u *CarTypeUsecase) Create(ctx context.Context, req dto.Name) (dto.IdName,
 }
 
 // Update
-func (s *CarTypeUsecase) Update(ctx context.Context, id int, req dto.Name) (dto.IdName, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CarTypeUsecase) Update(ctx context.Context, id int, req dto.Name) (dto.IdName, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CarTypeUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CarTypeUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CarTypeUsecase) GetById(ctx context.Context, id int) (dto.IdName, error) {
-	return s.base.GetById(ctx, id)
+func (u *CarTypeUsecase) GetById(ctx context.Context, id int) (dto.IdName, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CarTypeUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.IdName], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CarTypeUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.IdName], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/city_usecase.go b/src/usecase/city_usecase.go
index be3679c..9a90484 100644
--- a/src/usecase/city_usecase.go
+++ b/src/usecase/city_usecase.go
@@ -26,21 +26,21 @@ func (u *CityUsecase) Create(ctx context.Context, req dto.CreateCity) (dto.City,
 }
 
 // Update
-func (s *CityUsecase) Update(ctx context.Context, id int, req dto.UpdateCity) (dto.City, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CityUsecase) Update(ctx context.Context, id int, req dto.UpdateCity) (dto.City, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CityUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CityUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CityUsecase) GetById(ctx context.Context, id int) (dto.City, error) {
-	return s.base.GetById(ctx, id)
+func (u *CityUsecase) GetById(ctx context.Context, id int) (dto.City, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CityUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.City], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CityUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.City], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/color_usecase.go b/src/usecase/color_usecase.go
index 3d0010e..f9a643a 100644
--- a/src/usecase/color_usecase.go
+++ b/src/usecase/color_usecase.go
@@ -26,21 +26,21 @@ func (u *ColorUsecase) Create(ctx context.Context, req dto.CreateColor) (dto.Col
 }
 
 // Update
-func (s *ColorUsecase) Update(ctx context.Context, id int, req dto.UpdateColor) (dto.Color, error) {
-	return s.base.Update(ctx, id, req)
+func (u *ColorUsecase) Update(ctx context.Context, id int, req dto.UpdateColor) (dto.Color, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *ColorUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *ColorUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *ColorUsecase) GetById(ctx context.Context, id int) (dto.Color, error) {
-	return s.base.GetById(ctx, id)
+func (u *ColorUsecase) GetById(ctx context.Context, id int) (dto.Color, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *ColorUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.Color], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *ColorUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.Color], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/company_usecase.go b/src/usecase/company_usecase.go
index 125e439..0d9282e 100644
--- a/src/usecase/company_usecase.go
+++ b/src/usecase/company_usecase.go
@@ -26,21 +26,21 @@ func (u *CompanyUsecase) Create(ctx context.Context, req dto.CreateCompany) (dto
 }
 
 // Update
-func (s *CompanyUsecase) Update(ctx context.Context, id int, req dto.UpdateCompany) (dto.Company, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CompanyUsecase) Update(ctx context.Context, id int, req dto.UpdateCompany) (dto.Company, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CompanyUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CompanyUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CompanyUsecase) GetById(ctx context.Context, id int) (dto.Company, error) {
-	return s.base.GetById(ctx, id)
+func (u *CompanyUsecase) GetById(ctx context.Context, id int) (dto.Company, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CompanyUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.Company], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CompanyUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.Company], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/country_usecase.go b/src/usecase/country_usecase.go
index 8d8be0d..a82960c 100644
--- a/src/usecase/country_usecase.go
+++ b/src/usecase/country_usecase.go
@@ -26,21 +26,21 @@ func (u *CountryUsecase) Create(ctx context.Context, req dto.Name) (dto.Country,
 }
 
 // Update
-func (s *CountryUsecase) Update(ctx context.Context, id int, req dto.Name) (dto.Country, error) {
-	return s.base.Update(ctx, id, req)
+func (u *CountryUsecase) Update(ctx context.Context, id int, req dto.Name) (dto.Country, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *CountryUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *CountryUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *CountryUsecase) GetById(ctx context.Context, id int) (dto.Country, error) {
-	return s.base.GetById(ctx, id)
+func (u *CountryUsecase) GetById(ctx context.Context, id int) (dto.Country, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *CountryUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.Country], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *CountryUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.Country], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/file_usecase.go b/src/usecase/file_usecase.go
index a46b29f..c3cfc38 100644
--- a/src/usecase/file_usecase.go
+++ b/src/usecase/file_usecase.go
@@ -26,21 +26,21 @@ func (u *FileUsecase) Create(ctx context.Context, req dto.CreateFile) (dto.File,
 }
 
 // Update
-func (s *FileUsecase) Update(ctx context.Context, id int, req dto.UpdateFile) (dto.File, error) {
-	return s.base.Update(ctx, id, req)
+func (u *FileUsecase) Update(ctx context.Context, id int, req dto.UpdateFile) (dto.File, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *FileUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *FileUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *FileUsecase) GetById(ctx context.Context, id int) (dto.File, error) {
-	return s.base.GetById(ctx, id)
+func (u *FileUsecase) GetById(ctx context.Context, id int) (dto.File, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *FileUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.File], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *FileUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.File], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/gearbox_usecase.go b/src/usecase/gearbox_usecase.go
index 9bd6636..5622157 100644
--- a/src/usecase/gearbox_usecase.go
+++ b/src/usecase/gearbox_usecase.go
@@ -26,21 +26,21 @@ func (u *GearboxUsecase) Create(ctx context.Context, req dto.Name) (dto.IdName,
 }
 
 // Update
-func (s *GearboxUsecase) Update(ctx context.Context, id int, req dto.Name) (dto.IdName, error) {
-	return s.base.Update(ctx, id, req)
+func (u *GearboxUsecase) Update(ctx context.Context, id int, req dto.Name) (dto.IdName, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *GearboxUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *GearboxUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *GearboxUsecase) GetById(ctx context.Context, id int) (dto.IdName, error) {
-	return s.base.GetById(ctx, id)
+func (u *GearboxUsecase) GetById(ctx context.Context, id int) (dto.IdName, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *GearboxUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.IdName], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *GearboxUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.IdName], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/otp_usecase.go b/src/usecase/otp_usecase.go
index ffc20b0..cf51ee5 100644
--- a/src/usecase/otp_usecase.go
+++ b/src/usecase/otp_usecase.go
@@ -39,29 +39,29 @@ func (u *OtpUsecase) SendOtp(mobileNumber string) error {
 	return nil
 }
 
-func (s *OtpUsecase) SetOtp(mobileNumber string, otp string) error {
+func (u *OtpUsecase) SetOtp(mobileNumber string, otp string) error {
 	key := fmt.Sprintf("%s:%s", constant.RedisOtpDefaultKey, mobileNumber)
 	val := &otpDto{
 		Value: otp,
 		Used:  false,
 	}
 
-	res, err := cache.Get[otpDto](s.redisClient, key)
+	res, err := cache.Get[otpDto](u.redisClient, key)
 	if err == nil && !res.Used {
 		return &service_errors.ServiceError{EndUserMessage: service_errors.OptExists}
 	} else if err == nil && res.Used {
 		return &service_errors.ServiceError{EndUserMessage: service_errors.OtpUsed}
 	}
-	err = cache.Set(s.redisClient, key, val, s.cfg.Otp.ExpireTime*time.Second)
+	err = cache.Set(u.redisClient, key, val, u.cfg.Otp.ExpireTime*time.Second)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func (s *OtpUsecase) ValidateOtp(mobileNumber string, otp string) error {
+func (u *OtpUsecase) ValidateOtp(mobileNumber string, otp string) error {
 	key := fmt.Sprintf("%s:%s", constant.RedisOtpDefaultKey, mobileNumber)
-	res, err := cache.Get[otpDto](s.redisClient, key)
+	res, err := cache.Get[otpDto](u.redisClient, key)
 	if err != nil {
 		return err
 	} else if res.Used {
@@ -70,7 +70,7 @@ func (s *OtpUsecase) ValidateOtp(mobileNumber string, otp string) error {
 		return &service_errors.ServiceError{EndUserMessage: service_errors.OtpNotValid}
 	} else if !res.Used && res.Value == otp {
 		res.Used = true
-		err = cache.Set(s.redisClient, key, res, s.cfg.Otp.ExpireTime*time.Second)
+		err = cache.Set(u.redisClient, key, res, u.cfg.Otp.ExpireTime*time.Second)
 		if err != nil {
 			return err
 		}
diff --git a/src/usecase/propertyCategory_usecase.go b/src/usecase/propertyCategory_usecase.go
index cad6f4c..5d01bd7 100644
--- a/src/usecase/propertyCategory_usecase.go
+++ b/src/usecase/propertyCategory_usecase.go
@@ -26,21 +26,21 @@ func (u *PropertyCategoryUsecase) Create(ctx context.Context, req dto.CreateProp
 }
 
 // Update
-func (s *PropertyCategoryUsecase) Update(ctx context.Context, id int, req dto.UpdatePropertyCategory) (dto.PropertyCategory, error) {
-	return s.base.Update(ctx, id, req)
+func (u *PropertyCategoryUsecase) Update(ctx context.Context, id int, req dto.UpdatePropertyCategory) (dto.PropertyCategory, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *PropertyCategoryUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *PropertyCategoryUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *PropertyCategoryUsecase) GetById(ctx context.Context, id int) (dto.PropertyCategory, error) {
-	return s.base.GetById(ctx, id)
+func (u *PropertyCategoryUsecase) GetById(ctx context.Context, id int) (dto.PropertyCategory, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *PropertyCategoryUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.PropertyCategory], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *PropertyCategoryUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.PropertyCategory], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/property_usecase.go b/src/usecase/property_usecase.go
index 59ff240..b38b542 100644
--- a/src/usecase/property_usecase.go
+++ b/src/usecase/property_usecase.go
@@ -26,21 +26,21 @@ func (u *PropertyUsecase) Create(ctx context.Context, req dto.CreateProperty) (d
 }
 
 // Update
-func (s *PropertyUsecase) Update(ctx context.Context, id int, req dto.UpdateProperty) (dto.Property, error) {
-	return s.base.Update(ctx, id, req)
+func (u *PropertyUsecase) Update(ctx context.Context, id int, req dto.UpdateProperty) (dto.Property, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *PropertyUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *PropertyUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *PropertyUsecase) GetById(ctx context.Context, id int) (dto.Property, error) {
-	return s.base.GetById(ctx, id)
+func (u *PropertyUsecase) GetById(ctx context.Context, id int) (dto.Property, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *PropertyUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.Property], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *PropertyUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.Property], error) {
+	return u.base.GetByFilter(ctx, req)
 }
diff --git a/src/usecase/token_usecase.go b/src/usecase/token_usecase.go
index 48981c7..a20c59e 100644
--- a/src/usecase/token_usecase.go
+++ b/src/usecase/token_usecase.go
@@ -34,10 +34,10 @@ func NewTokenUsecase(cfg *config.Config) *TokenUsecase {
 	}
 }
 
-func (s *TokenUsecase) GenerateToken(token tokenDto) (*dto.TokenDetail, error) {
+func (u *TokenUsecase) GenerateToken(token tokenDto) (*dto.TokenDetail, error) {
 	td := &dto.TokenDetail{}
-	td.AccessTokenExpireTime = time.Now().Add(s.cfg.JWT.AccessTokenExpireDuration * time.Minute).Unix()
-	td.RefreshTokenExpireTime = time.Now().Add(s.cfg.JWT.RefreshTokenExpireDuration * time.Minute).Unix()
+	td.AccessTokenExpireTime = time.Now().Add(u.cfg.JWT.AccessTokenExpireDuration * time.Minute).Unix()
+	td.RefreshTokenExpireTime = time.Now().Add(u.cfg.JWT.RefreshTokenExpireDuration * time.Minute).Unix()
 
 	atc := jwt.MapClaims{}
 
@@ -53,7 +53,7 @@ func (s *TokenUsecase) GenerateToken(token tokenDto) (*dto.TokenDetail, error) {
 	at := jwt.NewWithClaims(jwt.SigningMethodHS256, atc)
 
 	var err error
-	td.AccessToken, err = at.SignedString([]byte(s.cfg.JWT.Secret))
+	td.AccessToken, err = at.SignedString([]byte(u.cfg.JWT.Secret))
 
 	if err != nil {
 		return nil, err
@@ -66,7 +66,7 @@ func (s *TokenUsecase) GenerateToken(token tokenDto) (*dto.TokenDetail, error) {
 
 	rt := jwt.NewWithClaims(jwt.SigningMethodHS256, rtc)
 
-	td.RefreshToken, err = rt.SignedString([]byte(s.cfg.JWT.RefreshSecret))
+	td.RefreshToken, err = rt.SignedString([]byte(u.cfg.JWT.RefreshSecret))
 
 	if err != nil {
 		return nil, err
@@ -75,13 +75,13 @@ func (s *TokenUsecase) GenerateToken(token tokenDto) (*dto.TokenDetail, error) {
 	return td, nil
 }
 
-func (s *TokenUsecase) VerifyToken(token string) (*jwt.Token, error) {
+func (u *TokenUsecase) VerifyToken(token string) (*jwt.Token, error) {
 	at, err := jwt.Parse(token, func(token *jwt.Token) (interface{}, error) {
 		_, ok := token.Method.(*jwt.SigningMethodHMAC)
 		if !ok {
 			return nil, &service_errors.ServiceError{EndUserMessage: service_errors.UnExpectedError}
 		}
-		return []byte(s.cfg.JWT.Secret), nil
+		return []byte(u.cfg.JWT.Secret), nil
 	})
 	if err != nil {
 		return nil, err
@@ -89,10 +89,10 @@ func (s *TokenUsecase) VerifyToken(token string) (*jwt.Token, error) {
 	return at, nil
 }
 
-func (s *TokenUsecase) GetClaims(token string) (claimMap map[string]interface{}, err error) {
+func (u *TokenUsecase) GetClaims(token string) (claimMap map[string]interface{}, err error) {
 	claimMap = map[string]interface{}{}
 
-	verifyToken, err := s.VerifyToken(token)
+	verifyToken, err := u.VerifyToken(token)
 	if err != nil {
 		return nil, err
 	}
diff --git a/src/usecase/year_usecase.go b/src/usecase/year_usecase.go
index 51981c8..d86575f 100644
--- a/src/usecase/year_usecase.go
+++ b/src/usecase/year_usecase.go
@@ -26,21 +26,21 @@ func (u *PersianYearUsecase) Create(ctx context.Context, req dto.CreatePersianYe
 }
 
 // Update
-func (s *PersianYearUsecase) Update(ctx context.Context, id int, req dto.UpdatePersianYear) (dto.PersianYear, error) {
-	return s.base.Update(ctx, id, req)
+func (u *PersianYearUsecase) Update(ctx context.Context, id int, req dto.UpdatePersianYear) (dto.PersianYear, error) {
+	return u.base.Update(ctx, id, req)
 }
 
 // Delete
-func (s *PersianYearUsecase) Delete(ctx context.Context, id int) error {
-	return s.base.Delete(ctx, id)
+func (u *PersianYearUsecase) Delete(ctx context.Context, id int) error {
+	return u.base.Delete(ctx, id)
 }
 
 // Get By Id
-func (s *PersianYearUsecase) GetById(ctx context.Context, id int) (dto.PersianYear, error) {
-	return s.base.GetById(ctx, id)
+func (u *PersianYearUsecase) GetById(ctx context.Context, id int) (dto.PersianYear, error) {
+	return u.base.GetById(ctx, id)
 }
 
 // Get By Filter
-func (s *PersianYearUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.PersianYear], error) {
-	return s.base.GetByFilter(ctx, req)
+func (u *PersianYearUsecase) GetByFilter(ctx context.Context, req filter.PaginationInputWithFilter) (*filter.PagedList[dto.PersianYear], error) {
+	return u.base.GetByFilter(ctx, req)
 }