remove db-consts.go

momentum-backend/momentum-core/momentum-controllers/repository-controller.go

@@ -8,6 +8,7 @@ import (
 	gitclient "momentum/git-client"
 	kustomizeclient "momentum/kustomize-client"
 	config "momentum/momentum-core/momentum-config"
+	model "momentum/momentum-core/momentum-model"
 	services "momentum/momentum-core/momentum-services"
 	tree "momentum/momentum-core/momentum-tree"
 	utils "momentum/momentum-core/momentum-utils"
@@ -47,8 +48,8 @@ func NewRepositoryController(
 
 func (rc *RepositoryController) AddRepository(record *models.Record, conf *config.MomentumConfig) error {
 
-	repoName := record.GetString(config.TABLE_REPOSITORIES_FIELD_NAME)
-	repoUrl := record.GetString(config.TABLE_REPOSITORIES_FIELD_URL)
+	repoName := record.GetString(model.TABLE_REPOSITORIES_FIELD_NAME)
+	repoUrl := record.GetString(model.TABLE_REPOSITORIES_FIELD_URL)
 	path := utils.BuildPath(conf.DataDir(), strings.ReplaceAll(repoName, " ", ""))
 
 	fmt.Println("adding repo", repoName, ", located at", repoUrl, "and to be written to", path)

momentum-backend/momentum-core/momentum-dispatcher.go

@@ -7,6 +7,7 @@ import (
 	kustomizeclient "momentum/kustomize-client"
 	conf "momentum/momentum-core/momentum-config"
 	controllers "momentum/momentum-core/momentum-controllers"
+	model "momentum/momentum-core/momentum-model"
 	services "momentum/momentum-core/momentum-services"
 
 	"github.com/pocketbase/pocketbase"
@@ -110,34 +111,34 @@ func (d *MomentumDispatcher) DispatchDelete(recordEvent *core.RecordDeleteEvent)
 
 func (d *MomentumDispatcher) setupCreateRules() []*MomentumDispatcherRule {
 	return []*MomentumDispatcherRule{
-		{conf.TABLE_REPOSITORIES_NAME, d.RepositoryController.AddRepository},
-		{conf.TABLE_APPLICATIONS_NAME, d.ApplicationsController.AddApplication},
-		{conf.TABLE_STAGES_NAME, d.StagesController.AddStage},
-		{conf.TABLE_DEPLOYMENTS_NAME, d.DeploymentController.AddDeployment},
+		{model.TABLE_REPOSITORIES_NAME, d.RepositoryController.AddRepository},
+		{model.TABLE_APPLICATIONS_NAME, d.ApplicationsController.AddApplication},
+		{model.TABLE_STAGES_NAME, d.StagesController.AddStage},
+		{model.TABLE_DEPLOYMENTS_NAME, d.DeploymentController.AddDeployment},
 	}
 }
 
 func (d *MomentumDispatcher) setupUpdateRules() []*MomentumDispatcherRule {
 	return []*MomentumDispatcherRule{
-		{conf.TABLE_REPOSITORIES_NAME, d.RepositoryController.UpdateRepository},
-		{conf.TABLE_APPLICATIONS_NAME, d.ApplicationsController.UpdateApplication},
-		{conf.TABLE_STAGES_NAME, d.StagesController.UpdateStage},
-		{conf.TABLE_DEPLOYMENTS_NAME, d.DeploymentController.UpdateDeployment},
+		{model.TABLE_REPOSITORIES_NAME, d.RepositoryController.UpdateRepository},
+		{model.TABLE_APPLICATIONS_NAME, d.ApplicationsController.UpdateApplication},
+		{model.TABLE_STAGES_NAME, d.StagesController.UpdateStage},
+		{model.TABLE_DEPLOYMENTS_NAME, d.DeploymentController.UpdateDeployment},
 	}
 }
 
 func (d *MomentumDispatcher) setupDeleteRules() []*MomentumDispatcherRule {
 	return []*MomentumDispatcherRule{
-		{conf.TABLE_REPOSITORIES_NAME, d.RepositoryController.DeleteRepository},
-		{conf.TABLE_APPLICATIONS_NAME, d.ApplicationsController.DeleteApplication},
-		{conf.TABLE_STAGES_NAME, d.StagesController.DeleteStage},
-		{conf.TABLE_DEPLOYMENTS_NAME, d.DeploymentController.DeleteDeployment},
+		{model.TABLE_REPOSITORIES_NAME, d.RepositoryController.DeleteRepository},
+		{model.TABLE_APPLICATIONS_NAME, d.ApplicationsController.DeleteApplication},
+		{model.TABLE_STAGES_NAME, d.StagesController.DeleteStage},
+		{model.TABLE_DEPLOYMENTS_NAME, d.DeploymentController.DeleteDeployment},
 	}
 }
 
 func (d *MomentumDispatcher) setupRepositoryAddedEventChannelObserver() {
 
-	d.Pocketbase.OnRecordAfterCreateRequest(conf.TABLE_REPOSITORIES_NAME).Add(func(e *core.RecordCreateEvent) error {
+	d.Pocketbase.OnRecordAfterCreateRequest(model.TABLE_REPOSITORIES_NAME).Add(func(e *core.RecordCreateEvent) error {
 
 		event := <-REPOSITORY_ADDED_EVENT_CHANNEL
 

momentum-backend/momentum-core/momentum-services/application-service.go

@@ -2,7 +2,7 @@ package momentumservices
 
 import (
 	"errors"
-	consts "momentum/momentum-core/momentum-config"
+	model "momentum/momentum-core/momentum-model"
 
 	"github.com/pocketbase/pocketbase/daos"
 	"github.com/pocketbase/pocketbase/models"
@@ -28,13 +28,13 @@ func NewApplicationService(dao *daos.Dao, stageService *StageService) *Applicati
 
 func (as *ApplicationService) AddRepository(repositoryRecord *models.Record, applications []*models.Record) error {
 
-	if repositoryRecord.Collection().Name != consts.TABLE_REPOSITORIES_NAME {
+	if repositoryRecord.Collection().Name != model.TABLE_REPOSITORIES_NAME {
 		return errors.New("repositoryRecord is not record of repositories collection")
 	}
 
 	for _, app := range applications {
 
-		app.Set(consts.TABLE_APPLICATIONS_FIELD_PARENTREPOSITORY, repositoryRecord.Id)
+		app.Set(model.TABLE_APPLICATIONS_FIELD_PARENTREPOSITORY, repositoryRecord.Id)
 		err := as.saveWithoutEvent(app)
 		if err != nil {
 			return err
@@ -46,7 +46,7 @@ func (as *ApplicationService) AddRepository(repositoryRecord *models.Record, app
 
 func (as *ApplicationService) GetApplicationCollection() (*models.Collection, error) {
 
-	return as.dao.FindCollectionByNameOrId(consts.TABLE_APPLICATIONS_NAME)
+	return as.dao.FindCollectionByNameOrId(model.TABLE_APPLICATIONS_NAME)
 }
 
 func (as *ApplicationService) createWithoutEvent(name string, stageIds []string) (*models.Record, error) {
@@ -57,8 +57,8 @@ func (as *ApplicationService) createWithoutEvent(name string, stageIds []string)
 	}
 
 	appRecord := models.NewRecord(appCollection)
-	appRecord.Set(consts.TABLE_APPLICATIONS_FIELD_NAME, name)
-	appRecord.Set(consts.TABLE_APPLICATIONS_FIELD_STAGES, stageIds)
+	appRecord.Set(model.TABLE_APPLICATIONS_FIELD_NAME, name)
+	appRecord.Set(model.TABLE_APPLICATIONS_FIELD_STAGES, stageIds)
 
 	return appRecord, as.saveWithoutEvent(appRecord)
 }

momentum-backend/momentum-core/momentum-services/deployment-service.go

@@ -2,7 +2,7 @@ package momentumservices
 
 import (
 	"errors"
-	consts "momentum/momentum-core/momentum-config"
+	model "momentum/momentum-core/momentum-model"
 
 	"github.com/pocketbase/pocketbase/daos"
 	"github.com/pocketbase/pocketbase/models"
@@ -29,12 +29,12 @@ func NewDeploymentService(dao *daos.Dao, keyValueService *KeyValueService) *Depl
 
 func (ds *DeploymentService) AddParentStage(stage *models.Record, deployments []*models.Record) error {
 
-	if stage.Collection().Name != consts.TABLE_STAGES_NAME {
+	if stage.Collection().Name != model.TABLE_STAGES_NAME {
 		return errors.New("stage is not record of stages collection")
 	}
 
 	for _, deployment := range deployments {
-		deployment.Set(consts.TABLE_DEPLOYMENTS_FIELD_PARENTSTAGE, stage.Id)
+		deployment.Set(model.TABLE_DEPLOYMENTS_FIELD_PARENTSTAGE, stage.Id)
 		err := ds.saveWithoutEvent(deployment)
 		if err != nil {
 			return err
@@ -46,13 +46,13 @@ func (ds *DeploymentService) AddParentStage(stage *models.Record, deployments []
 
 func (ds *DeploymentService) AddRepository(repositoryRecord *models.Record, deployments []*models.Record) error {
 
-	if repositoryRecord.Collection().Name != consts.TABLE_REPOSITORIES_NAME {
+	if repositoryRecord.Collection().Name != model.TABLE_REPOSITORIES_NAME {
 		return errors.New("repositoryRecord is not record of repositories collection")
 	}
 
 	for _, depl := range deployments {
 
-		depl.Set(consts.TABLE_DEPLOYMENTS_FIELD_REPOSITORIES, append(depl.Get(consts.TABLE_DEPLOYMENTS_FIELD_REPOSITORIES).([]string), repositoryRecord.Id))
+		depl.Set(model.TABLE_DEPLOYMENTS_FIELD_REPOSITORIES, append(depl.Get(model.TABLE_DEPLOYMENTS_FIELD_REPOSITORIES).([]string), repositoryRecord.Id))
 		err := ds.saveWithoutEvent(depl)
 		if err != nil {
 			return err
@@ -64,7 +64,7 @@ func (ds *DeploymentService) AddRepository(repositoryRecord *models.Record, depl
 
 func (ds *DeploymentService) GetDeploymentsCollection() (*models.Collection, error) {
 
-	coll, err := ds.dao.FindCollectionByNameOrId(consts.TABLE_DEPLOYMENTS_NAME)
+	coll, err := ds.dao.FindCollectionByNameOrId(model.TABLE_DEPLOYMENTS_NAME)
 	if err != nil {
 		return nil, err
 	}
@@ -80,7 +80,7 @@ func (ds *DeploymentService) createWithoutEvent(name string) (*models.Record, er
 	}
 
 	deploymentRecord := models.NewRecord(deploymentCollection)
-	deploymentRecord.Set(consts.TABLE_DEPLOYMENTS_FIELD_NAME, name)
+	deploymentRecord.Set(model.TABLE_DEPLOYMENTS_FIELD_NAME, name)
 
 	err = ds.saveWithoutEvent(deploymentRecord)
 

momentum-backend/momentum-core/momentum-services/keyvalue-service.go

@@ -1,7 +1,7 @@
 package momentumservices
 
 import (
-	consts "momentum/momentum-core/momentum-config"
+	model "momentum/momentum-core/momentum-model"
 
 	"github.com/pocketbase/pocketbase/daos"
 	"github.com/pocketbase/pocketbase/models"
@@ -26,7 +26,7 @@ func NewKeyValueService(dao *daos.Dao) *KeyValueService {
 
 func (kvs *KeyValueService) GetKeyValueCollection() (*models.Collection, error) {
 
-	coll, err := kvs.dao.FindCollectionByNameOrId(consts.TABLE_KEYVALUE_NAME)
+	coll, err := kvs.dao.FindCollectionByNameOrId(model.TABLE_KEYVALUE_NAME)
 	if err != nil {
 		return nil, err
 	}

momentum-backend/momentum-core/momentum-services/repository-service.go

@@ -2,7 +2,7 @@ package momentumservices
 
 import (
 	"fmt"
-	consts "momentum/momentum-core/momentum-config"
+	model "momentum/momentum-core/momentum-model"
 
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/daos"
@@ -31,7 +31,7 @@ func NewRepositoryService(dao *daos.Dao, appService *ApplicationService) *Reposi
 
 func (rs *RepositoryService) FindForName(name string) (*models.Record, error) {
 
-	recs, err := rs.dao.FindRecordsByExpr(consts.TABLE_REPOSITORIES_NAME, dbx.NewExp(consts.TABLE_REPOSITORIES_FIELD_NAME+" = {:"+consts.TABLE_REPOSITORIES_FIELD_NAME+"}", dbx.Params{consts.TABLE_REPOSITORIES_FIELD_NAME: name}))
+	recs, err := rs.dao.FindRecordsByExpr(model.TABLE_REPOSITORIES_NAME, dbx.NewExp(model.TABLE_REPOSITORIES_FIELD_NAME+" = {:"+model.TABLE_REPOSITORIES_FIELD_NAME+"}", dbx.Params{model.TABLE_REPOSITORIES_FIELD_NAME: name}))
 	if err != nil {
 		return nil, err
 	}