New PK naming for MemberId

grade/internal/domain/artifact/artifact.go

@@ -17,8 +17,8 @@ func NewArtifact(
 	description values.Description,
 	url values.Url,
 	competenceIds []competence.TenantCompetenceId,
-	authorIds []member.TenantMemberId,
-	ownerId member.TenantMemberId,
+	authorIds []member.MemberId,
+	ownerId member.MemberId,
 	createdAt time.Time,
 ) (*Artifact, error) {
 	e := events.NewArtifactProposed(
@@ -52,8 +52,8 @@ type Artifact struct {
 	description   values.Description
 	url           values.Url
 	competenceIds []competence.TenantCompetenceId
-	authorIds     []member.TenantMemberId
-	ownerId       member.TenantMemberId
+	authorIds     []member.MemberId
+	ownerId       member.MemberId
 	createdAt     time.Time
 	eventSourced  aggregate.EventSourcedAggregate[aggregate.PersistentDomainEvent]
 }
@@ -65,7 +65,7 @@ func (a Artifact) Id() values.TenantArtifactId {
 // TODO: Use Specification pattern instead?
 // https://enterprisecraftsmanship.com/posts/specification-pattern-always-valid-domain-model/
 
-func (a Artifact) HasAuthor(authorId member.TenantMemberId) bool {
+func (a Artifact) HasAuthor(authorId member.MemberId) bool {
 	for i := range a.authorIds {
 		if a.authorIds[i].Equal(authorId) {
 			return true
@@ -128,8 +128,8 @@ type ArtifactExporterSetter interface {
 	SetDescription(values.Description)
 	SetUrl(values.Url)
 	AddCompetenceId(competence.TenantCompetenceId)
-	AddAuthorId(member.TenantMemberId)
-	SetOwnerId(member.TenantMemberId)
+	AddAuthorId(member.MemberId)
+	SetOwnerId(member.MemberId)
 	SetCreatedAt(time.Time)
 	SetVersion(uint)
 }

grade/internal/domain/artifact/artifact_exporter.go

@@ -16,8 +16,8 @@ type ArtifactExporter struct {
 	Description   exporters.StringExporter
 	Url           exporters.StringExporter
 	CompetenceIds []competence.TenantCompetenceIdExporter
-	AuthorIds     []member.TenantMemberIdExporter
-	OwnerId       member.TenantMemberIdExporter
+	AuthorIds     []member.MemberIdExporter
+	OwnerId       member.MemberIdExporter
 	CreatedAt     time.Time
 	Version       uint
 }
@@ -48,13 +48,13 @@ func (ex *ArtifactExporter) AddCompetenceId(val competence.TenantCompetenceId) {
 	ex.CompetenceIds = append(ex.CompetenceIds, competenceExporter)
 }
 
-func (ex *ArtifactExporter) AddAuthorId(val member.TenantMemberId) {
-	var authorExporter member.TenantMemberIdExporter
+func (ex *ArtifactExporter) AddAuthorId(val member.MemberId) {
+	var authorExporter member.MemberIdExporter
 	val.Export(&authorExporter)
 	ex.AuthorIds = append(ex.AuthorIds, authorExporter)
 }
 
-func (ex *ArtifactExporter) SetOwnerId(val member.TenantMemberId) {
+func (ex *ArtifactExporter) SetOwnerId(val member.MemberId) {
 	val.Export(&ex.OwnerId)
 }
 

grade/internal/domain/artifact/artifact_faker.go

@@ -57,8 +57,8 @@ func NewArtifactFaker(opts ...ArtifactFakerOption) *ArtifactFaker {
 	f := &ArtifactFaker{
 		Id:              values.NewTenantArtifactIdFaker(),
 		CompetenceIds:   []competenceVal.TenantCompetenceIdFaker{competenceVal.NewTenantCompetenceIdFaker()},
-		AuthorIds:       []memberVal.TenantMemberIdFaker{},
-		OwnerId:         memberVal.NewTenantMemberIdFaker(),
+		AuthorIds:       []memberVal.MemberIdFaker{},
+		OwnerId:         memberVal.NewMemberIdFaker(),
 		MemberFaker:     member.NewMemberFaker(),
 		CompetenceFaker: competence.NewCompetenceFaker(),
 	}
@@ -80,8 +80,8 @@ type ArtifactFaker struct {
 	Description     string
 	Url             string
 	CompetenceIds   []competenceVal.TenantCompetenceIdFaker
-	AuthorIds       []memberVal.TenantMemberIdFaker
-	OwnerId         memberVal.TenantMemberIdFaker
+	AuthorIds       []memberVal.MemberIdFaker
+	OwnerId         memberVal.MemberIdFaker
 	CreatedAt       time.Time
 	Repository      ArtifactRepository
 	MemberFaker     *member.MemberFaker
@@ -100,7 +100,7 @@ func (f *ArtifactFaker) fake() {
 
 func (f *ArtifactFaker) Next() error {
 	f.fake()
-	f.AuthorIds = []memberVal.TenantMemberIdFaker{}
+	f.AuthorIds = []memberVal.MemberIdFaker{}
 	err := f.advanceId()
 	if err != nil {
 		return err
@@ -124,7 +124,7 @@ func (f *ArtifactFaker) advanceId() error {
 	return nil
 }
 
-func (f *ArtifactFaker) AddAuthorId(authorId memberVal.TenantMemberIdFaker) {
+func (f *ArtifactFaker) AddAuthorId(authorId memberVal.MemberIdFaker) {
 	f.AuthorIds = append(f.AuthorIds, authorId)
 }
 
@@ -166,7 +166,7 @@ func (f *ArtifactFaker) Create() (*Artifact, error) {
 		}
 		competenceIds = append(competenceIds, competenceId)
 	}
-	var authorIds []memberVal.TenantMemberId
+	var authorIds []memberVal.MemberId
 	for i := range f.AuthorIds {
 		authorId, err := f.AuthorIds[i].Create()
 		if err != nil {
@@ -202,7 +202,7 @@ func (f *ArtifactFaker) SetMemberId(val uint) {
 	f.CompetenceFaker.SetMemberId(val)
 }
 
-func (f *ArtifactFaker) SetId(id memberVal.TenantMemberIdFaker) {
+func (f *ArtifactFaker) SetId(id memberVal.MemberIdFaker) {
 	f.SetTenantId(id.TenantId)
 	f.SetMemberId(id.MemberId)
 }

grade/internal/domain/artifact/artifact_reconstitutor.go

@@ -37,8 +37,8 @@ type ArtifactSnapshotReconstitutor struct {
 	Description   string
 	Url           string
 	CompetenceIds []competenceVal.TenantCompetenceIdReconstitutor
-	AuthorIds     []memberVal.TenantMemberIdReconstitutor
-	OwnerId       memberVal.TenantMemberIdReconstitutor
+	AuthorIds     []memberVal.MemberIdReconstitutor
+	OwnerId       memberVal.MemberIdReconstitutor
 	CreatedAt     time.Time
 	Version       uint
 }
@@ -72,7 +72,7 @@ func (r ArtifactSnapshotReconstitutor) Reconstitute() (*Artifact, error) {
 		}
 		competenceIds = append(competenceIds, competenceId)
 	}
-	authorIds := []memberVal.TenantMemberId{}
+	authorIds := []memberVal.MemberId{}
 	for i := range r.AuthorIds {
 		authorId, err := r.AuthorIds[i].Reconstitute()
 		if err != nil {

grade/internal/domain/artifact/artifact_test.go

@@ -32,7 +32,7 @@ func TestArtifactExport(t *testing.T) {
 				f.CompetenceIds[0].CompetenceId,
 			),
 		},
-		OwnerId:   member.NewTenantMemberIdExporter(f.OwnerId.TenantId, f.OwnerId.MemberId),
+		OwnerId:   member.NewMemberIdExporter(f.OwnerId.TenantId, f.OwnerId.MemberId),
 		CreatedAt: f.CreatedAt,
 		Version:   1,
 	}, actualExporter)

grade/internal/domain/artifact/events/artifact_proposed.go

@@ -16,8 +16,8 @@ func NewArtifactProposed(
 	description values.Description,
 	url values.Url,
 	competenceIds []competence.TenantCompetenceId,
-	authorIds []member.TenantMemberId,
-	ownerId member.TenantMemberId,
+	authorIds []member.MemberId,
+	ownerId member.MemberId,
 	createdAt time.Time,
 ) *ArtifactProposed {
 	return &ArtifactProposed{
@@ -40,8 +40,8 @@ type ArtifactProposed struct {
 	description      values.Description
 	url              values.Url
 	competenceIds    []competence.TenantCompetenceId
-	authorIds        []member.TenantMemberId
-	ownerId          member.TenantMemberId
+	authorIds        []member.MemberId
+	ownerId          member.MemberId
 	createdAt        time.Time
 	aggregateVersion uint
 	eventMeta        aggregate.EventMeta
@@ -71,11 +71,11 @@ func (e ArtifactProposed) CompetenceIds() []competence.TenantCompetenceId {
 	return e.competenceIds
 }
 
-func (e ArtifactProposed) AuthorIds() []member.TenantMemberId {
+func (e ArtifactProposed) AuthorIds() []member.MemberId {
 	return e.authorIds
 }
 
-func (e ArtifactProposed) OwnerId() member.TenantMemberId {
+func (e ArtifactProposed) OwnerId() member.MemberId {
 	return e.ownerId
 }
 
@@ -137,7 +137,7 @@ type ArtifactProposedExporterSetter interface {
 	SetDescription(values.Description)
 	SetUrl(values.Url)
 	AddCompetenceId(competence.TenantCompetenceId)
-	AddAuthorId(member.TenantMemberId)
-	SetOwnerId(member.TenantMemberId)
+	AddAuthorId(member.MemberId)
+	SetOwnerId(member.MemberId)
 	SetCreatedAt(time.Time)
 }

grade/internal/domain/artifact/events/artifact_proposed_reconstitutor.go

@@ -16,8 +16,8 @@ type ArtifactProposedReconstitutor struct {
 	Description      string
 	Url              string
 	CompetenceIds    []competenceVal.TenantCompetenceIdReconstitutor
-	AuthorIds        []memberVal.TenantMemberIdReconstitutor
-	OwnerId          memberVal.TenantMemberIdReconstitutor
+	AuthorIds        []memberVal.MemberIdReconstitutor
+	OwnerId          memberVal.MemberIdReconstitutor
 	CreatedAt        time.Time
 	AggregateVersion uint
 	EventMeta        aggregate.EventMetaReconstitutor
@@ -52,7 +52,7 @@ func (r ArtifactProposedReconstitutor) Reconstitute() (*ArtifactProposed, error)
 		}
 		competenceIds = append(competenceIds, competenceId)
 	}
-	authorIds := []memberVal.TenantMemberId{}
+	authorIds := []memberVal.MemberId{}
 	for i := range r.AuthorIds {
 		authorId, err := r.AuthorIds[i].Reconstitute()
 		if err != nil {

grade/internal/domain/competence/competence.go

@@ -12,7 +12,7 @@ import (
 func NewCompetence(
 	id values.TenantCompetenceId,
 	name values.Name,
-	ownerId member.TenantMemberId,
+	ownerId member.MemberId,
 	createdAt time.Time,
 ) (*Competence, error) {
 	agg := &Competence{
@@ -35,7 +35,7 @@ func NewCompetence(
 type Competence struct {
 	id        values.TenantCompetenceId
 	name      values.Name
-	ownerId   member.TenantMemberId
+	ownerId   member.MemberId
 	createdAt time.Time
 	eventive  aggregate.EventiveEntity[aggregate.DomainEvent]
 	aggregate.VersionedAggregate
@@ -71,7 +71,7 @@ func (c Competence) Export(ex CompetenceExporterSetter) {
 type CompetenceExporterSetter interface {
 	SetId(id values.TenantCompetenceId)
 	SetName(values.Name)
-	SetOwnerId(member.TenantMemberId)
+	SetOwnerId(member.MemberId)
 	SetCreatedAt(time.Time)
 	SetVersion(uint)
 }

grade/internal/domain/competence/competence_exporter.go

@@ -11,7 +11,7 @@ import (
 type CompetenceExporter struct {
 	Id        values.TenantCompetenceIdExporter
 	Name      exporters.StringExporter
-	OwnerId   member.TenantMemberIdExporter
+	OwnerId   member.MemberIdExporter
 	CreatedAt time.Time
 	Version   uint
 }
@@ -24,7 +24,7 @@ func (ex *CompetenceExporter) SetName(val values.Name) {
 	val.Export(&ex.Name)
 }
 
-func (ex *CompetenceExporter) SetOwnerId(val member.TenantMemberId) {
+func (ex *CompetenceExporter) SetOwnerId(val member.MemberId) {
 	val.Export(&ex.OwnerId)
 }
 

grade/internal/domain/competence/competence_faker.go

@@ -39,7 +39,7 @@ func WithMemberFaker(memberFaker *member.MemberFaker) CompetenceFakerOption {
 func NewCompetenceFaker(opts ...CompetenceFakerOption) *CompetenceFaker {
 	f := &CompetenceFaker{
 		Id:          values.NewTenantCompetenceIdFaker(),
-		OwnerId:     memberVal.NewTenantMemberIdFaker(),
+		OwnerId:     memberVal.NewMemberIdFaker(),
 		Repository:  CompetenceDummyRepository{},
 		MemberFaker: member.NewMemberFaker(),
 	}
@@ -53,7 +53,7 @@ func NewCompetenceFaker(opts ...CompetenceFakerOption) *CompetenceFaker {
 type CompetenceFaker struct {
 	Id          values.TenantCompetenceIdFaker
 	Name        string
-	OwnerId     memberVal.TenantMemberIdFaker
+	OwnerId     memberVal.MemberIdFaker
 	CreatedAt   time.Time
 	Repository  CompetenceRepository
 	MemberFaker *member.MemberFaker
@@ -116,7 +116,7 @@ func (f *CompetenceFaker) SetMemberId(val uint) {
 	f.MemberFaker.SetMemberId(val)
 }
 
-func (f *CompetenceFaker) SetId(id memberVal.TenantMemberIdFaker) {
+func (f *CompetenceFaker) SetId(id memberVal.MemberIdFaker) {
 	f.SetTenantId(id.TenantId)
 	f.SetMemberId(id.MemberId)
 }

grade/internal/domain/competence/competence_reconstitutor.go

@@ -11,7 +11,7 @@ import (
 type CompetenceReconstitutor struct {
 	Id        values.TenantCompetenceIdReconstitutor
 	Name      string
-	OwnerId   member.TenantMemberIdReconstitutor
+	OwnerId   member.MemberIdReconstitutor
 	CreatedAt time.Time
 	Version   uint
 }

grade/internal/domain/competence/competence_test.go

@@ -22,7 +22,7 @@ func TestCompetenceExport(t *testing.T) {
 	assert.Equal(t, CompetenceExporter{
 		Id:        values.NewTenantCompetenceIdExporter(f.Id.TenantId, f.Id.CompetenceId),
 		Name:      exporters.StringExporter(f.Name),
-		OwnerId:   member.NewTenantMemberIdExporter(f.OwnerId.TenantId, f.OwnerId.MemberId),
+		OwnerId:   member.NewMemberIdExporter(f.OwnerId.TenantId, f.OwnerId.MemberId),
 		CreatedAt: f.CreatedAt,
 		Version:   1,
 	}, actualExporter)

grade/internal/domain/competence/events/competence_created.go

@@ -10,7 +10,7 @@ import (
 func NewCompetenceCreated(
 	id values.TenantCompetenceId,
 	name values.Name,
-	ownerId memberVal.TenantMemberId,
+	ownerId memberVal.MemberId,
 	createdAt time.Time,
 ) *CompetenceCreated {
 	return &CompetenceCreated{
@@ -24,7 +24,7 @@ func NewCompetenceCreated(
 type CompetenceCreated struct {
 	id               values.TenantCompetenceId
 	name             values.Name
-	ownerId          memberVal.TenantMemberId
+	ownerId          memberVal.MemberId
 	createdAt        time.Time
 	aggregateVersion uint
 }
@@ -57,7 +57,7 @@ func (e CompetenceCreated) Export(ex CompetenceCreatedExporterSetter) {
 type CompetenceCreatedExporterSetter interface {
 	SetId(id values.TenantCompetenceId)
 	SetName(values.Name)
-	SetOwnerId(memberVal.TenantMemberId)
+	SetOwnerId(memberVal.MemberId)
 	SetCreatedAt(time.Time)
 	SetEventType(string)
 	SetAggregateVersion(uint)

grade/internal/domain/endorser/endorser.go

@@ -19,7 +19,7 @@ var (
 // FIXME: Move this constructor to tenant aggregate
 
 func NewEndorser(
-	id member.TenantMemberId,
+	id member.MemberId,
 	createdAt time.Time,
 ) (*Endorser, error) {
 	availableCount, err := values.NewEndorsementCount(values.YearlyEndorsementCount)
@@ -49,7 +49,7 @@ func NewEndorser(
 // to track grade by version?
 
 type Endorser struct { // TODO: rename to Recognitory | Endorser | Originator | Sender (to Receiver)
-	id                        member.TenantMemberId
+	id                        member.MemberId
 	grade                     grade.Grade
 	availableEndorsementCount values.EndorsementCount
 	pendingEndorsementCount   values.EndorsementCount
@@ -58,7 +58,7 @@ type Endorser struct { // TODO: rename to Recognitory | Endorser | Originator |
 	aggregate.VersionedAggregate
 }
 
-func (e Endorser) Id() member.TenantMemberId {
+func (e Endorser) Id() member.MemberId {
 	return e.id
 }
 
@@ -139,7 +139,7 @@ func (e Endorser) Export(ex EndorserExporterSetter) {
 }
 
 type EndorserExporterSetter interface {
-	SetId(member.TenantMemberId)
+	SetId(member.MemberId)
 	SetGrade(grade.Grade)
 	SetAvailableEndorsementCount(values.EndorsementCount)
 	SetPendingEndorsementCount(values.EndorsementCount)

grade/internal/domain/endorser/endorser_exporter.go

@@ -10,15 +10,15 @@ import (
 )
 
 type EndorserExporter struct {
-	Id                        member.TenantMemberIdExporter
+	Id                        member.MemberIdExporter
 	Grade                     exporters.Uint8Exporter
 	AvailableEndorsementCount exporters.UintExporter
 	PendingEndorsementCount   exporters.UintExporter
 	CreatedAt                 time.Time
 	Version                   uint
 }
 
-func (ex *EndorserExporter) SetId(val member.TenantMemberId) {
+func (ex *EndorserExporter) SetId(val member.MemberId) {
 	val.Export(&ex.Id)
 }