refactor: rename entity

4 files changed, 16 insertions, 14 deletions

diff --git a/app/domain/entity.go b/app/domain/entity.go
index 0dc3995..4f3e63b 100644
--- a/app/domain/entity.go
+++ b/app/domain/entity.go
@@ -11,30 +11,30 @@ type Entity interface {
 	Validate() error
 }
 
-type defaultEntity struct {
+type entity struct {
 	ID ID `json:"id" jsonapi:"primary,entities"`
 }
 
-func (s *defaultEntity) GetID() ID {
+func (s *entity) GetID() ID {
 	return s.ID
 }
 
-func (s *defaultEntity) SetID(id ID) error {
+func (s *entity) SetID(id ID) error {
 	s.ID = id
 	return nil
 }
 
-func (s *defaultEntity) ToGID() string {
+func (s *entity) ToGID() string {
 	return "gid://sparkle/Entity/" + s.ID.String()
 }
 
-func (self *defaultEntity) ToObjectReference() *v1.ObjectReference {
+func (self *entity) ToObjectReference() *v1.ObjectReference {
 	return &v1.ObjectReference{
 		ObjectType: "entity",
 		ObjectId:   self.ID.String(),
 	}
 }
 
-func (s *defaultEntity) Validate() error {
+func (s *entity) Validate() error {
 	return errors.New("method Validate not implemented")
 }
diff --git a/app/domain/entity_test.go b/app/domain/entity_test.go
index ee3fbae..3f4c788 100644
--- a/app/domain/entity_test.go
+++ b/app/domain/entity_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/xlgmokha/x/pkg/x"
 )
 
-func TestDefaultEntity(t *testing.T) {
+func TestEntity(t *testing.T) {
 	type example struct {
-		defaultEntity
+		entity
 	}
 
 	t.Run("GetID", func(t *testing.T) {
@@ -48,7 +48,8 @@ func TestDefaultEntity(t *testing.T) {
 			require.NotNil(t, reference)
 			require.NoError(t, reference.Validate())
 			require.NoError(t, reference.ValidateAll())
-			assert.Equal(t, fmt.Sprintf("object_type:\"entity\" object_id:\"%s\"", example.ID), reference.String())
+			assert.Equal(t, example.ID.String(), reference.GetObjectId())
+			assert.Equal(t, "entity", reference.GetObjectType())
 		})
 	})
 }
diff --git a/app/domain/sparkle.go b/app/domain/sparkle.go
index 10e24de..748d12b 100644
--- a/app/domain/sparkle.go
+++ b/app/domain/sparkle.go
@@ -12,7 +12,7 @@ type Sparkle struct {
 	Sparklee string `json:"sparklee" jsonapi:"attr,sparklee"`
 	Author   *User  `json:"author" jsonapi:"attr,author"`
 	Reason   string `json:"reason" jsonapi:"attr,reason"`
-	defaultEntity
+	entity
 }
 
 var SparkleRegex = regexp.MustCompile(`\A\s*(?P<sparklee>@\w+)\s+(?P<reason>.+)\z`)
@@ -35,9 +35,9 @@ func NewSparkle(text string) (*Sparkle, error) {
 	}
 
 	return &Sparkle{
-		defaultEntity: defaultEntity{ID: ID(pls.GenerateULID())},
-		Sparklee:      matches[SparkleeIndex],
-		Reason:        matches[ReasonIndex],
+		entity:   entity{ID: ID(pls.GenerateULID())},
+		Sparklee: matches[SparkleeIndex],
+		Reason:   matches[ReasonIndex],
 	}, nil
 }
 
diff --git a/app/domain/sparkle_test.go b/app/domain/sparkle_test.go
index 101d271..a0e5d34 100644
--- a/app/domain/sparkle_test.go
+++ b/app/domain/sparkle_test.go
@@ -69,7 +69,8 @@ func TestSparkle(t *testing.T) {
 			require.NotNil(t, reference)
 			require.NoError(t, reference.Validate())
 			require.NoError(t, reference.ValidateAll())
-			assert.Equal(t, fmt.Sprintf("object_type:\"sparkle\" object_id:\"%s\"", sparkle.ID), reference.String())
+			assert.Equal(t, sparkle.ID.String(), reference.GetObjectId())
+			assert.Equal(t, "sparkle", reference.GetObjectType())
 		})
 	})
 }