Merge pull request #16 from scarlettmiss/refactor-services

impl
scarlettmiss · Apr 1, 2024 · 67a337f · 67a337f
2 parents 222af6e + 8146b04
commit 67a337f
Show file tree

Hide file tree

Showing 13 changed files with 731 additions and 755 deletions.
diff --git a/server/api/api.go b/server/api/api.go
diff --git a/server/api/converters.go b/server/api/converters.go
@@ -6,13 +6,13 @@ import (
 	"github.com/scarlettmiss/petJournal/application/domain/pet"
 	"github.com/scarlettmiss/petJournal/application/domain/record"
 	"github.com/scarlettmiss/petJournal/application/domain/user"
-	"github.com/scarlettmiss/petJournal/utils"
+	"github.com/scarlettmiss/petJournal/utils/text"
 	"time"
 )
 
 func PetCreateRequestToPetCreateOpts(requestBody PetCreateRequest, ownerId uuid.UUID) (application.PetCreateOptions, error) {
 	vId := uuid.Nil
-	if !utils.TextIsEmpty(requestBody.VetId) {
+	if !text.TextIsEmpty(requestBody.VetId) {
 		var err error
 		vId, err = uuid.Parse(requestBody.VetId)
 		if err != nil {
@@ -39,7 +39,7 @@ func PetCreateRequestToPetCreateOpts(requestBody PetCreateRequest, ownerId uuid.
 
 func PetUpdateRequestToPetUpdateOpts(requestBody PetUpdateRequest, pId uuid.UUID, uId uuid.UUID) (application.PetUpdateOptions, error) {
 	vId := uuid.Nil
-	if !utils.TextIsEmpty(requestBody.VetId) {
+	if !text.TextIsEmpty(requestBody.VetId) {
 		var err error
 		vId, err = uuid.Parse(requestBody.VetId)
 		if err != nil {