Refactoring

emacsway · Feb 18, 2024 · ee070eb · ee070eb
1 parent 4a5fa33
commit ee070eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/grade/internal/infrastructure/repositories/artifact/artifact_repository.go b/grade/internal/infrastructure/repositories/artifact/artifact_repository.go
@@ -35,9 +35,7 @@ func (r *ArtifactRepository) NextId(tenantId tenantVal.TenantId) (artifactVal.Ar
 func eventQuery(iEvent aggregate.PersistentDomainEvent) (q session.EventSourcedQueryEvaluator) {
 	switch event := iEvent.(type) {
 	case *events.ArtifactProposed:
-		q = &queries.ArtifactProposedQuery{}
-		qt := q.(events.ArtifactProposedExporterSetter)
-		event.Export(qt)
+		q = queries.NewArtifactProposedQuery(event)
 	}
 	return q
 }
diff --git a/grade/internal/infrastructure/repositories/artifact/queries/artifact_proposed_query.go b/grade/internal/infrastructure/repositories/artifact/queries/artifact_proposed_query.go
@@ -3,6 +3,7 @@ package queries
 import (
 	"time"
 
+	"github.com/emacsway/grade/grade/internal/domain/artifact/events"
 	"github.com/emacsway/grade/grade/internal/domain/artifact/values"
 	competenceVal "github.com/emacsway/grade/grade/internal/domain/competence/values"
 	memberVal "github.com/emacsway/grade/grade/internal/domain/member/values"
@@ -11,6 +12,12 @@ import (
 	"github.com/emacsway/grade/grade/internal/infrastructure/seedwork/session"
 )
 
+func NewArtifactProposedQuery(event *events.ArtifactProposed) *ArtifactProposedQuery {
+	q := &ArtifactProposedQuery{}
+	event.Export(q)
+	return q
+}
+
 type ArtifactProposedQuery struct {
 	repository.EventInsertQuery
 	payload ArtifactProposedPayload