fix: change to repository event types and removed unused code (#3386)

* fix: change to repository event types and removed unused code

* some fixes

* remove unused code

internal/org/model/member.go

@@ -1,21 +0,0 @@
-package model
-
-import es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
-
-type OrgMember struct {
-	es_models.ObjectRoot
-	UserID string
-	Roles  []string
-}
-
-func NewOrgMember(orgID, userID string) *OrgMember {
-	return &OrgMember{ObjectRoot: es_models.ObjectRoot{AggregateID: orgID}, UserID: userID}
-}
-
-func NewOrgMemberWithRoles(orgID, userID string, roles ...string) *OrgMember {
-	return &OrgMember{ObjectRoot: es_models.ObjectRoot{AggregateID: orgID}, UserID: userID, Roles: roles}
-}
-
-func (member *OrgMember) IsValid() bool {
-	return member.AggregateID != "" && member.UserID != ""
-}

internal/org/model/org.go

@@ -3,8 +3,6 @@ package model
 import (
 	"strings"
 
-	"github.com/golang/protobuf/ptypes/timestamp"
-
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
@@ -16,32 +14,7 @@ type Org struct {
 	Name    string
 	Domains []*OrgDomain
 
-	Members                  []*OrgMember
-	DomainPolicy             *iam_model.DomainPolicy
-	LoginPolicy              *iam_model.LoginPolicy
-	LabelPolicy              *iam_model.LabelPolicy
-	MailTemplate             *iam_model.MailTemplate
-	MailTexts                []*iam_model.MailText
-	PasswordComplexityPolicy *iam_model.PasswordComplexityPolicy
-	PasswordAgePolicy        *iam_model.PasswordAgePolicy
-	LockoutPolicy            *iam_model.LockoutPolicy
-
-	IDPs []*iam_model.IDPConfig
-}
-type OrgChanges struct {
-	Changes      []*OrgChange
-	LastSequence uint64
-}
-
-type OrgChange struct {
-	ChangeDate        *timestamp.Timestamp `json:"changeDate,omitempty"`
-	EventType         string               `json:"eventType,omitempty"`
-	Sequence          uint64               `json:"sequence,omitempty"`
-	ModifierId        string               `json:"modifierUser,omitempty"`
-	ModifierName      string               `json:"-"`
-	ModifierLoginName string               `json:"-"`
-	ModifierAvatarURL string               `json:"-"`
-	Data              interface{}          `json:"data,omitempty"`
+	DomainPolicy *iam_model.DomainPolicy
 }
 
 type OrgState int32
@@ -51,18 +24,10 @@ const (
 	OrgStateInactive
 )
 
-func NewOrg(id string) *Org {
-	return &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: id}, State: OrgStateActive}
-}
-
 func (o *Org) IsActive() bool {
 	return o.State == OrgStateActive
 }
 
-func (o *Org) IsValid() bool {
-	return o.Name != ""
-}
-
 func (o *Org) GetDomain(domain *OrgDomain) (int, *OrgDomain) {
 	for i, d := range o.Domains {
 		if d.Domain == domain.Domain {
@@ -72,15 +37,6 @@ func (o *Org) GetDomain(domain *OrgDomain) (int, *OrgDomain) {
 	return -1, nil
 }
 
-func (o *Org) GetIDP(idpID string) (int, *iam_model.IDPConfig) {
-	for i, idp := range o.IDPs {
-		if idp.IDPConfigID == idpID {
-			return i, idp
-		}
-	}
-	return -1, nil
-}
-
 func (o *Org) GetPrimaryDomain() *OrgDomain {
 	for _, d := range o.Domains {
 		if d.Primary {
@@ -90,15 +46,6 @@ func (o *Org) GetPrimaryDomain() *OrgDomain {
 	return nil
 }
 
-func (o *Org) MemeberByUserID(userID string) (*OrgMember, int) {
-	for i, member := range o.Members {
-		if member.UserID == userID {
-			return member, i
-		}
-	}
-	return nil, -1
-}
-
 func (o *Org) nameForDomain(iamDomain string) string {
 	return strings.ToLower(strings.ReplaceAll(o.Name, " ", "-") + "." + iamDomain)
 }

internal/org/model/org_member_view.go

@@ -1,70 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"github.com/caos/zitadel/internal/domain"
-	caos_errors "github.com/caos/zitadel/internal/errors"
-)
-
-type OrgMemberView struct {
-	UserID             string
-	OrgID              string
-	UserName           string
-	Email              string
-	FirstName          string
-	LastName           string
-	DisplayName        string
-	PreferredLoginName string
-	AvatarURL          string
-	UserResourceOwner  string
-	Roles              []string
-	CreationDate       time.Time
-	ChangeDate         time.Time
-	Sequence           uint64
-}
-
-type OrgMemberSearchRequest struct {
-	Offset        uint64
-	Limit         uint64
-	SortingColumn OrgMemberSearchKey
-	Asc           bool
-	Queries       []*OrgMemberSearchQuery
-}
-
-type OrgMemberSearchKey int32
-
-const (
-	OrgMemberSearchKeyUnspecified OrgMemberSearchKey = iota
-	OrgMemberSearchKeyUserName
-	OrgMemberSearchKeyEmail
-	OrgMemberSearchKeyFirstName
-	OrgMemberSearchKeyLastName
-	OrgMemberSearchKeyOrgID
-	OrgMemberSearchKeyUserID
-)
-
-type OrgMemberSearchQuery struct {
-	Key    OrgMemberSearchKey
-	Method domain.SearchMethod
-	Value  interface{}
-}
-
-type OrgMemberSearchResponse struct {
-	Offset      uint64
-	Limit       uint64
-	TotalResult uint64
-	Result      []*OrgMemberView
-	Sequence    uint64
-	Timestamp   time.Time
-}
-
-func (r *OrgMemberSearchRequest) EnsureLimit(limit uint64) error {
-	if r.Limit > limit {
-		return caos_errors.ThrowInvalidArgument(nil, "SEARCH-77fu3", "Errors.Limit.ExceedsDefault")
-	}
-	if r.Limit == 0 {
-		r.Limit = limit
-	}
-	return nil
-}