Clean up.

AmadlaOrg · Oct 26, 2024 · 235a2e3 · 235a2e3
1 parent 3abc8de
commit 235a2e3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/entity/build/build_test.go b/entity/build/build_test.go
@@ -36,15 +36,15 @@ func TestMeta(t *testing.T) {
 		hasError             bool
 	}{
 		// FIXME:
-		/*{
+		{
 			name: "Valid Entity URI Without Version",
 			inputPaths: storage.AbsPaths{
 				Entities: "testdata",
 			},
 			inputEntityUri:    "github.com/example/entity",
 			internalEntityDir: "testdata/entity_remote.txt",
 			mockValidation: func(mockValidation *validation.MockEntityValidation) {
-				mockValidation.EXPECT().EntityUri("https://github.com/example/entity").Return(true)
+				mockValidation.EXPECT().EntityUri("github.com/example/entity").Return(true)
 			},
 			mockEntityVersion: func(mockEntityVersion *version.MockEntityVersion) {
 				mockEntityVersion.EXPECT().List("https://github.com/example/entity").Return([]string{"v1.0.0"}, nil)
@@ -66,7 +66,7 @@ func TestMeta(t *testing.T) {
 				Exist:           true,
 			},
 			hasError: false,
-		},*/
+		},
 		//
 		// Error
 		//

diff --git a/entity/entity.go b/entity/entity.go
@@ -27,7 +27,8 @@ type IEntity interface {
 
 // SEntity used for mock
 type SEntity struct {
-	EntityVersion version.IVersion
+	EntityVersion           version.IVersion
+	EntityVersionValidation versionValidationPkg.IValidation
 
 	// Data
 	Entities []Entity
@@ -124,8 +125,7 @@ func (s *SEntity) GetEntity(entityUri string) (Entity, error) {
 
 // FindEntityDir can find pseudo versioned entity directories and static versioned entities.
 func (s *SEntity) FindEntityDir(paths storage.AbsPaths, entityVals Entity) (string, error) {
-	entityVersionValidation := versionValidationPkg.NewEntityVersionValidationService()
-	if !entityVersionValidation.PseudoFormat(entityVals.Version) {
+	if !s.EntityVersionValidation.PseudoFormat(entityVals.Version) {
 		exactPath := entityVals.Entity
 
 		// Check if the directory exists
@@ -169,13 +169,11 @@ func (s *SEntity) FindEntityDir(paths storage.AbsPaths, entityVals Entity) (stri
 
 // CheckDuplicateEntity checks if entityMeta is already in entityBuilds.
 func (s *SEntity) CheckDuplicateEntity(entities []Entity, entityMeta Entity) error {
-	entityVersionValidation := versionValidationPkg.NewEntityVersionValidationService()
-
 	for _, existingEntity := range entities {
 		if existingEntity.Origin == entityMeta.Origin &&
 			existingEntity.Name == entityMeta.Name {
-			if entityVersionValidation.PseudoFormat(existingEntity.Version) &&
-				entityVersionValidation.PseudoFormat(entityMeta.Version) {
+			if s.EntityVersionValidation.PseudoFormat(existingEntity.Version) &&
+				s.EntityVersionValidation.PseudoFormat(entityMeta.Version) {
 				// Check pseudo versions
 				if s.GeneratePseudoVersionPattern(existingEntity.Name, existingEntity.Version) ==
 					s.GeneratePseudoVersionPattern(entityMeta.Name, entityMeta.Version) {

diff --git a/entity/service.go b/entity/service.go
@@ -1,11 +1,15 @@
 package entity
 
-import "github.com/AmadlaOrg/hery/entity/version"
+import (
+	"github.com/AmadlaOrg/hery/entity/version"
+	versionValidationPkg "github.com/AmadlaOrg/hery/entity/version/validation"
+)
 
 // NewEntityService to set up the entity build service
 func NewEntityService() *SEntity {
 	return &SEntity{
-		EntityVersion: version.NewEntityVersionService(),
+		EntityVersion:           version.NewEntityVersionService(),
+		EntityVersionValidation: versionValidationPkg.NewEntityVersionValidationService(),
 
 		// Data
 		Entities: []Entity{},