Upgrade

Author: emacsway

grade/internal/infrastructure/repositories/artifact/artifact_repository.go

@@ -17,7 +17,7 @@ import (
 
 func NewArtifactRepository() *ArtifactRepository {
 	return &ArtifactRepository{
-		eventStore: repository.NewEventStore("Artifact", eventToQuery),
+		eventStore: repository.NewEventStore(nil, "Artifact", eventToQuery),
 	}
 }
 
@@ -45,7 +45,7 @@ func (r *ArtifactRepository) Get(s session.Session, id artifactVal.ArtifactId) (
 		StreamId:           streamId,
 		EventReconstitutor: rowToEvent,
 	}
-	stream, err := q.Stream(s)
+	stream, err := q.Stream(r.eventStore.MakeReadCodecFactory(), s)
 	if err != nil {
 		return nil, err
 	}
@@ -64,6 +64,7 @@ func eventToQuery(iEvent aggregate.PersistentDomainEvent) (q repository.EventSou
 }
 
 func rowToEvent(
+	codec repository.Codec,
 	streamId repository.StreamId,
 	streamPosition uint,
 	eventType string,
@@ -80,11 +81,11 @@ func rowToEvent(
 	switch expectedCase {
 	case c{events.ArtifactProposed{}.EventType(), 1}:
 		rec := events.ArtifactProposedReconstitutor{}
-		err := json.Unmarshal([]byte(payload), &rec)
+		err := codec.Decode(payload, &rec)
 		if err != nil {
 			return nil, err
 		}
-		rec.AggregateId.TenantId = streamId.TenantId()
+		rec.AggregateId.TenantId = streamId.TenantId().(uint)
 		artifactId, err := strconv.ParseUint(streamId.StreamId(), 10, 0)
 		if err != nil {
 			return nil, err

grade/internal/infrastructure/repositories/artifact/queries/artifact_proposed_query.go

@@ -66,9 +66,9 @@ func (q *ArtifactProposedQuery) SetCreatedAt(val time.Time) {
 	q.payload.CreatedAt = val
 }
 
-func (q *ArtifactProposedQuery) Evaluate(s session.Session) (session.Result, error) {
+func (q *ArtifactProposedQuery) Evaluate(codecFactory repository.CodecFactory, s session.Session) (session.Result, error) {
 	q.EventInsertQuery.SetPayload(q.payload)
-	return q.EventInsertQuery.Evaluate(s)
+	return q.EventInsertQuery.Evaluate(codecFactory, s)
 }
 
 type ArtifactProposedPayload struct {

grade/internal/infrastructure/repositories/competence/queries/name_updated_query.go

@@ -3,7 +3,6 @@ package queries
 import (
 	"github.com/emacsway/grade/grade/internal/domain/competence/values"
 	tenantVal "github.com/emacsway/grade/grade/internal/domain/tenant/values"
-	"github.com/krew-solutions/ascetic-ddd-go/asceticddd/seedwork/domain/aggregate"
 	"github.com/krew-solutions/ascetic-ddd-go/asceticddd/session"
 )
 
@@ -52,7 +51,7 @@ func (q *NameUpdatedQuery) Evaluate(s session.Session) (session.Result, error) {
 		return result, err
 	}
 	if rowsAffected == 0 {
-		return result, aggregate.ErrConcurrency
+		return result, session.ErrConcurrency
 	}
 	return result, err
 }

grade/internal/infrastructure/repositories/competence/queries/name_updated_query_with_lock.go

@@ -3,7 +3,6 @@ package queries
 import (
 	"github.com/emacsway/grade/grade/internal/domain/competence/values"
 	tenantVal "github.com/emacsway/grade/grade/internal/domain/tenant/values"
-	"github.com/krew-solutions/ascetic-ddd-go/asceticddd/seedwork/domain/aggregate"
 	"github.com/krew-solutions/ascetic-ddd-go/asceticddd/session"
 )
 
@@ -71,7 +70,7 @@ func (q *NameUpdatedQueryWithLock) Evaluate(s session.Session) (session.Result,
 		return result, err
 	}
 	if rowsAffected == 0 {
-		return result, aggregate.ErrConcurrency
+		return result, session.ErrConcurrency
 	}
 	return result, err
 }

grade/internal/infrastructure/repositories/competence/queries/optimistic_offline_lock_query.go

@@ -6,7 +6,6 @@ import (
 	"github.com/emacsway/grade/grade/internal/domain/competence/values"
 	memberVal "github.com/emacsway/grade/grade/internal/domain/member/values"
 	tenantVal "github.com/emacsway/grade/grade/internal/domain/tenant/values"
-	"github.com/krew-solutions/ascetic-ddd-go/asceticddd/seedwork/domain/aggregate"
 	"github.com/krew-solutions/ascetic-ddd-go/asceticddd/session"
 )
 
@@ -61,7 +60,7 @@ func (q *OptimisticOfflineLockLockQuery) Evaluate(s session.Session) (session.Re
 		return result, err
 	}
 	if rowsAffected == 0 {
-		return result, aggregate.ErrConcurrency
+		return result, session.ErrConcurrency
 	}
 	return result, err
 }