feat(niki): implement kind box req accepted notification

adapter/sms_provider/kavenegar/notification/send.go

@@ -7,7 +7,8 @@ import (
 )
 
 func (a *Adapter) Send(phoneNumber, message string) {
-	const op = "kavenegarnotification.SendNotification"
+	const op = "kavenegarnotification.Send"
+
 	var params *kavenegar.MessageSendParam
 	if _, err := a.adapter.Client().Message.Send(a.adapter.Config().Sender, []string{phoneNumber}, message, params); err != nil {
 		//nolint

config.yml

@@ -28,8 +28,8 @@ benefactor_service:
   length_of_otp_code: 5
 
 kavenegar_sms_provider:
-  api_key: 68556765576F785033342F774C336A7A5A574C7863497457706656364B6848534E63373661736A676B65553D
+  api_key: insert_your_api_key
-  sender: ""
+  sender: insert_sender_number
   otp_template_new_user: ebhomeverify
   otp_template_registered_user: ebhomeverify
 

delivery/http_server/admin/kind_box_req/accept.go

@@ -48,5 +48,6 @@ func (h Handler) Accept(c echo.Context) error {
 		return echo.NewHTTPError(code, msg)
 	}
 	go h.notificationSvc.KindBoxReqAccepted(params.NotificationKindBoxReqAccepted{KindBoxReqID: req.ID})
+
 	return c.JSON(http.StatusOK, resp)
 }

delivery/http_server/server.go

@@ -2,7 +2,6 @@ package httpserver
 
 import (
 	"fmt"
-	"git.gocasts.ir/ebhomengo/niki/service/notification"
 
 	"git.gocasts.ir/ebhomengo/niki/config"
 	adminhandler "git.gocasts.ir/ebhomengo/niki/delivery/http_server/admin/admin"
@@ -24,6 +23,7 @@ import (
 	benefactorservice "git.gocasts.ir/ebhomengo/niki/service/benefactor/benefactor"
 	benefactorkindboxservice "git.gocasts.ir/ebhomengo/niki/service/benefactor/kind_box"
 	benefactorkindboxreqservice "git.gocasts.ir/ebhomengo/niki/service/benefactor/kind_box_req"
+	"git.gocasts.ir/ebhomengo/niki/service/notification"
 	adminvalidator "git.gocasts.ir/ebhomengo/niki/validator/admin/admin"
 	adminkindboxvalidator "git.gocasts.ir/ebhomengo/niki/validator/admin/kind_box"
 	adminkindboxreqvalidator "git.gocasts.ir/ebhomengo/niki/validator/admin/kind_box_req"

internal/initial/service.go

@@ -41,6 +41,7 @@ type Services struct {
 func initSmsOtp(cfg config.Config) *kavenegarotp.Adapter {
 	return kavenegarotp.New(smsprovider.New(cfg.KavenegarSmsProvider))
 }
+
 func initSmsNotification(cfg config.Config) *kavenegarnotification.Adapter {
 	return kavenegarnotification.New(smsprovider.New(cfg.KavenegarSmsProvider))
 }
@@ -49,8 +50,8 @@ func InitAdminService(cfg config.Config, db *mysql.DB) adminservice.Service {
 	return adminservice.New(InitAdminMysql(db), InitAdminAuthService(cfg))
 }
 
-func InitBenefactorForAdminService(db *mysql.DB) benefactorforadminservice.Service {
+func InitBenefactorForAdminService(cfg config.Config, redisAdapter redis.Adapter, db *mysql.DB) benefactorforadminservice.Service {
-	return benefactorforadminservice.New(InitAdminMysql(db))
+	return benefactorforadminservice.New(InitAdminMysql(db), InitBenefactorService(cfg, redisAdapter, db))
 }
 
 func InitBenefactorService(cfg config.Config, redisAdapter redis.Adapter, db *mysql.DB) benefactorservice.Service {
@@ -93,6 +94,6 @@ func InitBenefactorKindBoxService(db *mysql.DB) benefactorkindboxservice.Service
 	return benefactorkindboxservice.New(mysqlkindbox.New(db))
 }
 
-func InitNotificationService(cfg config.Config, db *mysql.DB) notification.Service {
+func InitNotificationService(cfg config.Config, redisAdapter redis.Adapter, db *mysql.DB) notification.Service {
-	return notification.New(initSmsNotification(cfg), InitAdminKindBoxReqService(db), InitBenefactorForAdminService(db))
+	return notification.New(initSmsNotification(cfg), InitAdminKindBoxReqService(db), InitBenefactorForAdminService(cfg, redisAdapter, db))
 }

internal/initial/validator.go

@@ -25,8 +25,8 @@ type Validators struct {
 	AgentKindBoxVld         agentkindboxvalidator.Validator
 }
 
-func InitAdminKindBoxReqValidator(db *mysql.DB, cfg config.Config) adminkindboxreqvalidator.Validator {
+func InitAdminKindBoxReqValidator(db *mysql.DB, cfg config.Config, redisAdapter redis.Adapter) adminkindboxreqvalidator.Validator {
-	return adminkindboxreqvalidator.New(InitBenefactorKindBoxReqDB(db), InitAdminService(cfg, db), InitBenefactorForAdminService(db), InitAdminReferTimeService(db), InitBenefactorAddressService(db))
+	return adminkindboxreqvalidator.New(InitBenefactorKindBoxReqDB(db), InitAdminService(cfg, db), InitBenefactorForAdminService(cfg, redisAdapter, db), InitAdminReferTimeService(db), InitBenefactorAddressService(db))
 }
 
 func InitAdminValidator(db *mysql.DB) adminvalidator.Validator {

main.go

@@ -3,9 +3,8 @@ package main
 import (
 	"flag"
 	"fmt"
+
 	"git.gocasts.ir/ebhomengo/niki/adapter/redis"
-	"git.gocasts.ir/ebhomengo/niki/adapter/sms_provider/kavenegar"
-	kavenegarnotification "git.gocasts.ir/ebhomengo/niki/adapter/sms_provider/kavenegar/notification"
 	"git.gocasts.ir/ebhomengo/niki/config"
 	httpserver "git.gocasts.ir/ebhomengo/niki/delivery/http_server"
 	"git.gocasts.ir/ebhomengo/niki/internal/initial"
@@ -41,8 +40,6 @@ func main() {
 	migrate := parseFlags()
 
 	cfg := config.C()
-	sms := kavenegarnotification.New(kavenegar.New(cfg.KavenegarSmsProvider))
-	sms.Send("09915436059", "salam")
 	db := initDatabase(cfg, migrate)
 	defer func() {
 		if err := db.CloseStatements(); err != nil {
@@ -73,7 +70,7 @@ func initDependencies(cfg config.Config, redisAdapter redis.Adapter, db *mysql.D
 			BenefactorKindBoxReqVld: initial.InitBenefactorKindBoxReqValidator(cfg, redisAdapter, db),
 			BenefactorAddressVld:    initial.InitBenefactorAddressValidator(cfg, redisAdapter, db),
 			BenefactorKindBoxVld:    initial.InitBenefactorKindBoxValidator(cfg, redisAdapter, db),
-			AdminKindBoxReqVld:      initial.InitAdminKindBoxReqValidator(db, cfg),
+			AdminKindBoxReqVld:      initial.InitAdminKindBoxReqValidator(db, cfg, redisAdapter),
 			AdminVld:                initial.InitAdminValidator(db),
 			AdminKindBoxVld:         initial.InitAdminKindBoxValidator(db, cfg),
 			AgentKindBoxVld:         initial.InitAgentKindBoxValidator(db),
@@ -88,7 +85,7 @@ func initDependencies(cfg config.Config, redisAdapter redis.Adapter, db *mysql.D
 			AdminKindBoxReqSvc:      initial.InitAdminKindBoxReqService(db),
 			AdminSvc:                initial.InitAdminService(cfg, db),
 			AdminReferTimeSvc:       initial.InitAdminReferTimeService(db),
-			NotificationSvc:         initial.InitNotificationService(cfg, db),
+			NotificationSvc:         initial.InitNotificationService(cfg, redisAdapter, db),
 		},
 		initial.AdminAuthorization{
 			AdminAuthorizationSvc: initial.InitAdminAuthorizationService(db),

service/admin/benefactor/address.go

@@ -1,4 +1,4 @@
-package benefactor
+package adminbenefactorservice
 
 import (
 	"context"

service/admin/benefactor/get.go

@@ -1,24 +1,26 @@
-package benefactor
+package adminbenefactorservice
 
 import (
 	"context"
+
 	param "git.gocasts.ir/ebhomengo/niki/param/admin/admin"
 	params "git.gocasts.ir/ebhomengo/niki/param/admin/benefactor"
-
 	richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error"
 )
 
 func (s Service) GetByID(ctx context.Context, req params.GetBenefactorByIDRequest) (params.GetBenefactorByIDResponse, error) {
-	const op = "benefactorservice.Get"
+	const op = "adminbenefactorservice.GetByID"
-	bnf, gErr := s.repo.GetByID(ctx, req.BenefactorID)
+
+	bnf, gErr := s.benefactorService.GetByID(ctx, req)
 	if gErr != nil {
 		return params.GetBenefactorByIDResponse{}, richerror.New(op).WithErr(gErr)
 	}
-	return params.GetBenefactorByIDResponse{bnf}, nil
+
+	return params.GetBenefactorByIDResponse{Benefactor: bnf.Benefactor}, nil
 }
 
 func (s Service) BenefactorExistByID(ctx context.Context, req param.BenefactorExistByIDRequest) (param.BenefactorExistByIDResponse, error) {
-	const op = "adminservice.BenefactorExistByID"
+	const op = "adminbenefactorservice.BenefactorExistByID"
 
 	isExisted, err := s.repo.IsExistBenefactorByID(ctx, req.ID)
 	if err != nil {

service/admin/benefactor/service.go

@@ -1,26 +1,25 @@
-package benefactor
+package adminbenefactorservice
 
 import (
 	"context"
 
 	"git.gocasts.ir/ebhomengo/niki/entity"
-	param "git.gocasts.ir/ebhomengo/niki/param/admin/admin"
+	params "git.gocasts.ir/ebhomengo/niki/param/admin/benefactor"
 )
 
 type Repository interface {
-	GetByID(ctx context.Context, benefactorID uint) (entity.Benefactor, error)
 	IsExistBenefactorByID(ctx context.Context, id uint) (bool, error)
 	GetAddressByID(ctx context.Context, id uint) (*entity.Address, error)
 }
-type ForAdminSvc interface {
+type BenefactorService interface {
-	BenefactorExistByID(ctx context.Context, request param.BenefactorExistByIDRequest) (param.BenefactorExistByIDResponse, error)
+	GetByID(ctx context.Context, req params.GetBenefactorByIDRequest) (params.GetBenefactorByIDResponse, error)
-	AddressExistByID(ctx context.Context, request param.GetAddressByIDRequest) (param.GetAddressByIDResponse, error)
 }
 
 type Service struct {
-	repo Repository
+	repo              Repository
+	benefactorService BenefactorService
 }
 
-func New(repo Repository) Service {
+func New(repo Repository, benefactorService BenefactorService) Service {
-	return Service{repo: repo}
+	return Service{repo: repo, benefactorService: benefactorService}
 }

service/benefactor/benefactor/get.go

@@ -3,6 +3,7 @@ package benefactorservice
 import (
 	"context"
 
+	params "git.gocasts.ir/ebhomengo/niki/param/admin/benefactor"
 	param "git.gocasts.ir/ebhomengo/niki/param/benefactor/benefactore"
 	richerror "git.gocasts.ir/ebhomengo/niki/pkg/rich_error"
 )
@@ -17,3 +18,14 @@ func (s Service) BenefactorExistByID(ctx context.Context, req param.BenefactorEx
 
 	return param.BenefactorExistByIDResponse{Existed: isExisted}, nil
 }
+
+func (s Service) GetByID(ctx context.Context, req params.GetBenefactorByIDRequest) (params.GetBenefactorByIDResponse, error) {
+	const op = "benefactorservice.GetByID"
+
+	bnf, gErr := s.repo.GetByID(ctx, req.BenefactorID)
+	if gErr != nil {
+		return params.GetBenefactorByIDResponse{}, richerror.New(op).WithErr(gErr)
+	}
+
+	return params.GetBenefactorByIDResponse{Benefactor: bnf}, nil
+}

service/benefactor/benefactor/service.go

@@ -17,6 +17,7 @@ type Repository interface {
 	IsExistBenefactorByPhoneNumber(ctx context.Context, phoneNumber string) (bool, entity.Benefactor, error)
 	CreateBenefactor(ctx context.Context, benefactor entity.Benefactor) (entity.Benefactor, error)
 	IsExistBenefactorByID(ctx context.Context, id uint) (bool, error)
+	GetByID(ctx context.Context, benefactorID uint) (entity.Benefactor, error)
 }
 
 type AuthGenerator interface {

service/notification/kindboxreq_accepted.go

@@ -3,6 +3,7 @@ package notification
 import (
 	"context"
 	"fmt"
+
 	params "git.gocasts.ir/ebhomengo/niki/param"
 	bnfparam "git.gocasts.ir/ebhomengo/niki/param/admin/benefactor"
 	kbparam "git.gocasts.ir/ebhomengo/niki/param/admin/kind_box_req"
@@ -10,10 +11,18 @@ import (
 )
 
 func (s Service) KindBoxReqAccepted(req params.NotificationKindBoxReqAccepted) {
+	const op = "notification.KindBoxReqAccepted"
+
 	ctx := context.Background()
-	kb, _ := s.KindBoxReqSvc.Get(ctx, kbparam.GetKindBoxReqRequest{
+	kb, err := s.KindBoxReqSvc.Get(ctx, kbparam.GetKindBoxReqRequest{
 		KindBoxID: req.KindBoxReqID,
 	})
-	bnf, _ := s.BenefactorSvc.GetByID(ctx, bnfparam.GetBenefactorByIDRequest{BenefactorID: kb.BenefactorID})
+	if err != nil {
+		fmt.Println(fmt.Errorf("error(%s):%w", op, err))
+	}
+	bnf, gErr := s.BenefactorSvc.GetByID(ctx, bnfparam.GetBenefactorByIDRequest{BenefactorID: kb.BenefactorID})
+	if err != nil {
+		fmt.Println(fmt.Errorf("error(%s):%w", op, gErr))
+	}
 	s.smsAdapter.Send(bnf.PhoneNumber, fmt.Sprintf(smsmsg.SmsMsgKindBoxReqAccepted, bnf.FirstName))
 }

service/notification/service.go

@@ -2,6 +2,7 @@ package notification
 
 import (
 	"context"
+
 	params "git.gocasts.ir/ebhomengo/niki/param/admin/benefactor"
 	param "git.gocasts.ir/ebhomengo/niki/param/admin/kind_box_req"
 )