From ee070eb5bcc81f761d0b08099f0886a2064936ce Mon Sep 17 00:00:00 2001 From: Ivan Zakrevsky Date: Sun, 18 Feb 2024 03:06:55 +0300 Subject: [PATCH] Refactoring --- .../repositories/artifact/artifact_repository.go | 4 +--- .../artifact/queries/artifact_proposed_query.go | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/grade/internal/infrastructure/repositories/artifact/artifact_repository.go b/grade/internal/infrastructure/repositories/artifact/artifact_repository.go index e32db332..668e45f1 100644 --- 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 index ff636775..09f5b250 100644 --- 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