merch-tracker-v2/merch-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

log wrappers refactor

Browse source
This commit is contained in:
nquidox 2026-03-08 15:12:17 +03:00
parent bf193c7d90
commit 40344d47b5
3 changed files with 46 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

26
internal/merch/service.go
View file

@ -8,6 +8,8 @@ import (
"github.com/google/uuid"
)
const serviceLogHeader string = "[Service]"
type service struct {
repo Repository
utils utils.Utils
@ -31,14 +33,14 @@ func (s *service) createOrigin(ctx context.Context, o *newOriginDTO) error {
Name: o.Name,
}
logDebugService("create origin success")
logDebug(serviceLogHeader, "create origin success")
return s.repo.createOrigin(ctx, newOrigin)
}
func (s *service) getOrigins(ctx context.Context) (*originsDTO, error) {
data, err := s.repo.getOrigins(ctx)
if err != nil {
logErrService(err)
logErr(serviceLogHeader, err)
return nil, err
}
@ -54,12 +56,12 @@ func (s *service) getOrigins(ctx context.Context) (*originsDTO, error) {
Origins: origins,
}
logDebugService("get origins success")
logDebug(serviceLogHeader, "get origins success")
return response, nil
}
func (s *service) deleteOrigin(ctx context.Context, origin *deleteOriginDTO) error {
logDebugService("delete origin success")
logDebug(serviceLogHeader, "delete origin success")
return s.repo.deleteOriginByName(ctx, origin.Name, s.utils.NullTimeNowUTC())
}
@ -72,7 +74,7 @@ func (s *service) createMerch(ctx context.Context, userId int64, payload *newMer
merchUuid, err := uuid.NewV7()
if err != nil {
logErrService(err)
logErr(serviceLogHeader, err)
return err
}
@ -90,7 +92,7 @@ func (s *service) createMerch(ctx context.Context, userId int64, payload *newMer
originsMap, _, err := s.getOriginsMaps(ctx)
if err != nil {
logErrService(err)
logErr(serviceLogHeader, err)
return err
}
@ -112,7 +114,7 @@ func (s *service) createMerch(ctx context.Context, userId int64, payload *newMer
func (s *service) getOriginsMaps(ctx context.Context) (map[string]int64, map[int64]string, error) {
origins, err := s.repo.getOrigins(ctx)
if err != nil {
logErrService(err)
logErr(serviceLogHeader, err)
return nil, nil, err
}
@ -127,6 +129,10 @@ func (s *service) getOriginsMaps(ctx context.Context) (map[string]int64, map[int
return namesMap, idsMap, nil
}
func (s *service) getMerchUuidMap(ctx context.Context, uuids []string) (map[string]int64, error) {
return s.repo.getMerchUuidMap(ctx, uuids)
}
func (s *service) getMany(ctx context.Context, userId int64) ([]merchDTO, error) {
return s.repo.getMany(ctx, userId)
}
@ -138,13 +144,13 @@ func (s *service) updateMerch(ctx context.Context, userId int64, payload *update
func (s *service) updateExtraData(ctx context.Context, userId int64, payload *extraDataDTO) (*extraDataDTO, error) {
merchId, err := s.repo.getMerchIdByUuid(ctx, userId, payload.MerchUuid)
if err != nil {
logErrService(err)
logErr(serviceLogHeader, err)
return nil, err
}
origins, ids, err := s.getOriginsMaps(ctx)
if err != nil {
logErrService(err)
logErr(serviceLogHeader, err)
return nil, err
}
@ -166,7 +172,7 @@ func (s *service) updateExtraData(ctx context.Context, userId int64, payload *ex
result, err := s.repo.updateExtraData(ctx, merchId, insertData)
if err != nil {
logErrService(err)
logErr(serviceLogHeader, err)
return nil, err
}