fix: all enums same style (#262)

* fix: all enums same style

* fix: rename process to reduce

* add some missing enum renaming

Co-authored-by: Livio Amstutz <livio.a@gmail.com>

internal/org/model/domain_view.go

@@ -25,11 +25,11 @@ type OrgDomainSearchRequest struct {
 type OrgDomainSearchKey int32
 
 const (
-	ORGDOMAINSEARCHKEY_UNSPECIFIED OrgDomainSearchKey = iota
-	ORGDOMAINSEARCHKEY_DOMAIN
-	ORGDOMAINSEARCHKEY_ORG_ID
-	ORGDOMAINSEARCHKEY_VERIFIED
-	ORGDOMAINSEARCHKEY_PRIMARY
+	OrgDomainSearchKeyUnspecified OrgDomainSearchKey = iota
+	OrgDomainSearchKeyDomain
+	OrgDomainSearchKeyOrgID
+	OrgDomainSearchKeyVerified
+	OrgDomainSearchKeyPrimary
 )
 
 type OrgDomainSearchQuery struct {

internal/org/model/org.go

@@ -32,16 +32,16 @@ type OrgChange struct {
 type OrgState int32
 
 const (
-	ORGSTATE_ACTIVE OrgState = iota
-	ORGSTATE_INACTIVE
+	OrgStateActive OrgState = iota
+	OrgStateInactive
 )
 
 func NewOrg(id string) *Org {
-	return &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: id}, State: ORGSTATE_ACTIVE}
+	return &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: id}, State: OrgStateActive}
 }
 
 func (o *Org) IsActive() bool {
-	return o.State == ORGSTATE_ACTIVE
+	return o.State == OrgStateActive
 }
 
 func (o *Org) IsValid() bool {

internal/org/model/org_iam_policy.go

@@ -16,6 +16,6 @@ type OrgIamPolicy struct {
 type PolicyState int32
 
 const (
-	POLICYSTATE_ACTIVE PolicyState = iota
-	POLICYSTATE_REMOVED
+	PolicyStateActive PolicyState = iota
+	PolicyStateRemoved
 )

internal/org/model/org_member_view.go

@@ -30,13 +30,13 @@ type OrgMemberSearchRequest struct {
 type OrgMemberSearchKey int32
 
 const (
-	ORGMEMBERSEARCHKEY_UNSPECIFIED OrgMemberSearchKey = iota
-	ORGMEMBERSEARCHKEY_USER_NAME
-	ORGMEMBERSEARCHKEY_EMAIL
-	ORGMEMBERSEARCHKEY_FIRST_NAME
-	ORGMEMBERSEARCHKEY_LAST_NAME
-	ORGMEMBERSEARCHKEY_ORG_ID
-	ORGMEMBERSEARCHKEY_USER_ID
+	OrgMemberSearchKeyUnspecified OrgMemberSearchKey = iota
+	OrgMemberSearchKeyUserName
+	OrgMemberSearchKeyEmail
+	OrgMemberSearchKeyFirstName
+	OrgMemberSearchKeyLastName
+	OrgMemberSearchKeyOrgID
+	OrgMemberSearchKeyUserID
 )
 
 type OrgMemberSearchQuery struct {

internal/org/model/org_view.go

@@ -29,12 +29,12 @@ type OrgSearchRequest struct {
 type OrgSearchKey int32
 
 const (
-	ORGSEARCHKEY_UNSPECIFIED OrgSearchKey = iota
-	ORGSEARCHKEY_ORG_ID
-	ORGSEARCHKEY_ORG_NAME
-	ORGSEARCHKEY_ORG_DOMAIN
-	ORGSEARCHKEY_STATE
-	ORGSEARCHKEY_RESOURCEOWNER
+	OrgSearchKeyUnspecified OrgSearchKey = iota
+	OrgSearchKeyOrgID
+	OrgSearchKeyOrgName
+	OrgSearchKeyOrgDomain
+	OrgSearchKeyState
+	OrgSearchKeyResourceOwner
 )
 
 type OrgSearchQuery struct {

internal/org/repository/eventsourcing/model/org.go

@@ -84,9 +84,9 @@ func (o *Org) AppendEvent(event *es_models.Event) error {
 			return err
 		}
 	case OrgDeactivated:
-		o.State = int32(org_model.ORGSTATE_INACTIVE)
+		o.State = int32(org_model.OrgStateInactive)
 	case OrgReactivated:
-		o.State = int32(org_model.ORGSTATE_ACTIVE)
+		o.State = int32(org_model.OrgStateActive)
 	case OrgMemberAdded:
 		member, err := OrgMemberFromEvent(nil, event)
 		if err != nil {

internal/org/repository/eventsourcing/model/org_test.go

@@ -26,7 +26,7 @@ func TestOrgFromEvents(t *testing.T) {
 				},
 				org: &Org{Name: "OrgName"},
 			},
-			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.ORGSTATE_ACTIVE), Name: "OrgName"},
+			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.OrgStateActive), Name: "OrgName"},
 		},
 		{
 			name: "org from events, nil org",
@@ -36,7 +36,7 @@ func TestOrgFromEvents(t *testing.T) {
 				},
 				org: nil,
 			},
-			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.ORGSTATE_ACTIVE)},
+			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.OrgStateActive)},
 		},
 	}
 	for _, tt := range tests {
@@ -69,7 +69,7 @@ func TestAppendEvent(t *testing.T) {
 				event: &es_models.Event{AggregateID: "ID", Sequence: 1, Type: OrgAdded},
 				org:   &Org{Name: "OrgName"},
 			},
-			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.ORGSTATE_ACTIVE), Name: "OrgName"},
+			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.OrgStateActive), Name: "OrgName"},
 		},
 		{
 			name: "append change event",
@@ -77,28 +77,28 @@ func TestAppendEvent(t *testing.T) {
 				event: &es_models.Event{AggregateID: "ID", Sequence: 1, Type: OrgChanged, Data: []byte(`{"name": "OrgName}`)},
 				org:   &Org{Name: "OrgNameChanged"},
 			},
-			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.ORGSTATE_ACTIVE), Name: "OrgNameChanged"},
+			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.OrgStateActive), Name: "OrgNameChanged"},
 		},
 		{
 			name: "append deactivate event",
 			args: args{
 				event: &es_models.Event{AggregateID: "ID", Sequence: 1, Type: OrgDeactivated},
 			},
-			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.ORGSTATE_INACTIVE)},
+			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.OrgStateInactive)},
 		},
 		{
 			name: "append reactivate event",
 			args: args{
 				event: &es_models.Event{AggregateID: "ID", Sequence: 1, Type: OrgReactivated},
 			},
-			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.ORGSTATE_ACTIVE)},
+			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.OrgStateActive)},
 		},
 		{
 			name: "append added domain event",
 			args: args{
 				event: &es_models.Event{AggregateID: "ID", Sequence: 1, Type: OrgDomainAdded},
 			},
-			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.ORGSTATE_ACTIVE)},
+			result: &Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "ID"}, State: int32(model.OrgStateActive)},
 		},
 	}
 	for _, tt := range tests {

internal/org/repository/eventsourcing/org.go

@@ -141,7 +141,7 @@ func orgDeactivateAggregate(aggCreator *es_models.AggregateCreator, org *model.O
 		if org == nil {
 			return nil, errors.ThrowPreconditionFailed(nil, "EVENT-R03z8", "Errors.Internal")
 		}
-		if org.State == int32(org_model.ORGSTATE_INACTIVE) {
+		if org.State == int32(org_model.OrgStateInactive) {
 			return nil, errors.ThrowInvalidArgument(nil, "EVENT-mcPH0", "Errors.Internal.AlreadyDeactivated")
 		}
 		agg, err := OrgAggregate(ctx, aggCreator, org.AggregateID, org.Sequence)
@@ -158,7 +158,7 @@ func orgReactivateAggregate(aggCreator *es_models.AggregateCreator, org *model.O
 		if org == nil {
 			return nil, errors.ThrowPreconditionFailed(nil, "EVENT-cTHLd", "Errors.Internal")
 		}
-		if org.State == int32(org_model.ORGSTATE_ACTIVE) {
+		if org.State == int32(org_model.OrgStateActive) {
 			return nil, errors.ThrowInvalidArgument(nil, "EVENT-pUSMs", "Errors.Org.AlreadyActive")
 		}
 		agg, err := OrgAggregate(ctx, aggCreator, org.AggregateID, org.Sequence)

internal/org/repository/eventsourcing/org_test.go

@@ -236,7 +236,7 @@ func TestOrgReactivateAggregate(t *testing.T) {
 						AggregateID: "orgID",
 						Sequence:    2,
 					},
-					State: int32(org_model.ORGSTATE_INACTIVE),
+					State: int32(org_model.OrgStateInactive),
 				},
 			},
 		},
@@ -250,7 +250,7 @@ func TestOrgReactivateAggregate(t *testing.T) {
 						AggregateID: "orgID",
 						Sequence:    2,
 					},
-					State: int32(org_model.ORGSTATE_ACTIVE),
+					State: int32(org_model.OrgStateActive),
 				},
 			},
 			res: res{
@@ -310,7 +310,7 @@ func TestOrgDeactivateAggregate(t *testing.T) {
 						AggregateID: "orgID",
 						Sequence:    2,
 					},
-					State: int32(org_model.ORGSTATE_ACTIVE),
+					State: int32(org_model.OrgStateActive),
 				},
 			},
 		},
@@ -324,7 +324,7 @@ func TestOrgDeactivateAggregate(t *testing.T) {
 						AggregateID: "orgID",
 						Sequence:    2,
 					},
-					State: int32(org_model.ORGSTATE_INACTIVE),
+					State: int32(org_model.OrgStateInactive),
 				},
 			},
 			res: res{

internal/org/repository/view/model/org.go

@@ -69,16 +69,16 @@ func (o *OrgView) AppendEvent(event *es_models.Event) (err error) {
 	switch event.Type {
 	case model.OrgAdded:
 		o.CreationDate = event.CreationDate
-		o.State = int32(org_model.ORGSTATE_ACTIVE)
+		o.State = int32(org_model.OrgStateActive)
 		o.setRootData(event)
 		err = o.SetData(event)
 	case model.OrgChanged:
 		o.setRootData(event)
 		err = o.SetData(event)
 	case model.OrgDeactivated:
-		o.State = int32(org_model.ORGSTATE_INACTIVE)
+		o.State = int32(org_model.OrgStateInactive)
 	case model.OrgReactivated:
-		o.State = int32(org_model.ORGSTATE_ACTIVE)
+		o.State = int32(org_model.OrgStateActive)
 	}
 	return err
 }

internal/org/repository/view/model/org_domain_query.go

@@ -19,7 +19,7 @@ func (req OrgDomainSearchRequest) GetOffset() uint64 {
 }
 
 func (req OrgDomainSearchRequest) GetSortingColumn() view.ColumnKey {
-	if req.SortingColumn == org_model.ORGDOMAINSEARCHKEY_UNSPECIFIED {
+	if req.SortingColumn == org_model.OrgDomainSearchKeyUnspecified {
 		return nil
 	}
 	return OrgDomainSearchKey(req.SortingColumn)
@@ -51,13 +51,13 @@ func (req OrgDomainSearchQuery) GetValue() interface{} {
 
 func (key OrgDomainSearchKey) ToColumnName() string {
 	switch org_model.OrgDomainSearchKey(key) {
-	case org_model.ORGDOMAINSEARCHKEY_DOMAIN:
+	case org_model.OrgDomainSearchKeyDomain:
 		return OrgDomainKeyDomain
-	case org_model.ORGDOMAINSEARCHKEY_ORG_ID:
+	case org_model.OrgDomainSearchKeyOrgID:
 		return OrgDomainKeyOrgID
-	case org_model.ORGDOMAINSEARCHKEY_VERIFIED:
+	case org_model.OrgDomainSearchKeyVerified:
 		return OrgDomainKeyVerified
-	case org_model.ORGDOMAINSEARCHKEY_PRIMARY:
+	case org_model.OrgDomainSearchKeyPrimary:
 		return OrgDomainKeyPrimary
 	default:
 		return ""

internal/org/repository/view/model/org_member_query.go

@@ -19,7 +19,7 @@ func (req OrgMemberSearchRequest) GetOffset() uint64 {
 }
 
 func (req OrgMemberSearchRequest) GetSortingColumn() view.ColumnKey {
-	if req.SortingColumn == proj_model.ORGMEMBERSEARCHKEY_UNSPECIFIED {
+	if req.SortingColumn == proj_model.OrgMemberSearchKeyUnspecified {
 		return nil
 	}
 	return OrgMemberSearchKey(req.SortingColumn)
@@ -51,17 +51,17 @@ func (req OrgMemberSearchQuery) GetValue() interface{} {
 
 func (key OrgMemberSearchKey) ToColumnName() string {
 	switch proj_model.OrgMemberSearchKey(key) {
-	case proj_model.ORGMEMBERSEARCHKEY_EMAIL:
+	case proj_model.OrgMemberSearchKeyEmail:
 		return OrgMemberKeyEmail
-	case proj_model.ORGMEMBERSEARCHKEY_FIRST_NAME:
+	case proj_model.OrgMemberSearchKeyFirstName:
 		return OrgMemberKeyFirstName
-	case proj_model.ORGMEMBERSEARCHKEY_LAST_NAME:
+	case proj_model.OrgMemberSearchKeyLastName:
 		return OrgMemberKeyLastName
-	case proj_model.ORGMEMBERSEARCHKEY_USER_NAME:
+	case proj_model.OrgMemberSearchKeyUserName:
 		return OrgMemberKeyUserName
-	case proj_model.ORGMEMBERSEARCHKEY_USER_ID:
+	case proj_model.OrgMemberSearchKeyUserID:
 		return OrgMemberKeyUserID
-	case proj_model.ORGMEMBERSEARCHKEY_ORG_ID:
+	case proj_model.OrgMemberSearchKeyOrgID:
 		return OrgMemberKeyOrgID
 	default:
 		return ""

internal/org/repository/view/model/org_query.go

@@ -19,7 +19,7 @@ func (req OrgSearchRequest) GetOffset() uint64 {
 }
 
 func (req OrgSearchRequest) GetSortingColumn() view.ColumnKey {
-	if req.SortingColumn == usr_model.ORGSEARCHKEY_UNSPECIFIED {
+	if req.SortingColumn == usr_model.OrgSearchKeyUnspecified {
 		return nil
 	}
 	return OrgSearchKey(req.SortingColumn)
@@ -51,15 +51,15 @@ func (req OrgSearchQuery) GetValue() interface{} {
 
 func (key OrgSearchKey) ToColumnName() string {
 	switch usr_model.OrgSearchKey(key) {
-	case usr_model.ORGSEARCHKEY_ORG_DOMAIN:
+	case usr_model.OrgSearchKeyOrgDomain:
 		return OrgKeyOrgDomain
-	case usr_model.ORGSEARCHKEY_ORG_ID:
+	case usr_model.OrgSearchKeyOrgID:
 		return OrgKeyOrgID
-	case usr_model.ORGSEARCHKEY_ORG_NAME:
+	case usr_model.OrgSearchKeyOrgName:
 		return OrgKeyOrgName
-	case usr_model.ORGSEARCHKEY_RESOURCEOWNER:
+	case usr_model.OrgSearchKeyResourceOwner:
 		return OrgKeyResourceOwner
-	case usr_model.ORGSEARCHKEY_STATE:
+	case usr_model.OrgSearchKeyState:
 		return OrgKeyState
 	default:
 		return ""

internal/org/repository/view/org_domain_view.go

@@ -10,8 +10,8 @@ import (
 
 func OrgDomainByOrgIDAndDomain(db *gorm.DB, table, orgID, domain string) (*model.OrgDomainView, error) {
 	domainView := new(model.OrgDomainView)
-	orgIDQuery := &model.OrgDomainSearchQuery{Key: org_model.ORGDOMAINSEARCHKEY_ORG_ID, Value: orgID, Method: global_model.SEARCHMETHOD_EQUALS}
-	domainQuery := &model.OrgDomainSearchQuery{Key: org_model.ORGDOMAINSEARCHKEY_DOMAIN, Value: domain, Method: global_model.SEARCHMETHOD_EQUALS}
+	orgIDQuery := &model.OrgDomainSearchQuery{Key: org_model.OrgDomainSearchKeyOrgID, Value: orgID, Method: global_model.SearchMethodEquals}
+	domainQuery := &model.OrgDomainSearchQuery{Key: org_model.OrgDomainSearchKeyDomain, Value: domain, Method: global_model.SearchMethodEquals}
 	query := view.PrepareGetByQuery(table, orgIDQuery, domainQuery)
 	err := query(db, domainView)
 	return domainView, err
@@ -19,8 +19,8 @@ func OrgDomainByOrgIDAndDomain(db *gorm.DB, table, orgID, domain string) (*model
 
 func VerifiedOrgDomain(db *gorm.DB, table, domain string) (*model.OrgDomainView, error) {
 	domainView := new(model.OrgDomainView)
-	domainQuery := &model.OrgDomainSearchQuery{Key: org_model.ORGDOMAINSEARCHKEY_DOMAIN, Value: domain, Method: global_model.SEARCHMETHOD_EQUALS}
-	verifiedQuery := &model.OrgDomainSearchQuery{Key: org_model.ORGDOMAINSEARCHKEY_VERIFIED, Value: true, Method: global_model.SEARCHMETHOD_EQUALS}
+	domainQuery := &model.OrgDomainSearchQuery{Key: org_model.OrgDomainSearchKeyDomain, Value: domain, Method: global_model.SearchMethodEquals}
+	verifiedQuery := &model.OrgDomainSearchQuery{Key: org_model.OrgDomainSearchKeyVerified, Value: true, Method: global_model.SearchMethodEquals}
 	query := view.PrepareGetByQuery(table, domainQuery, verifiedQuery)
 	err := query(db, domainView)
 	return domainView, err
@@ -40,9 +40,9 @@ func OrgDomainsByOrgID(db *gorm.DB, table string, orgID string) ([]*model.OrgDom
 	domains := make([]*model.OrgDomainView, 0)
 	queries := []*org_model.OrgDomainSearchQuery{
 		{
-			Key:    org_model.ORGDOMAINSEARCHKEY_ORG_ID,
+			Key:    org_model.OrgDomainSearchKeyOrgID,
 			Value:  orgID,
-			Method: global_model.SEARCHMETHOD_EQUALS,
+			Method: global_model.SearchMethodEquals,
 		},
 	}
 	query := view.PrepareSearchQuery(table, model.OrgDomainSearchRequest{Queries: queries})
@@ -60,8 +60,8 @@ func PutOrgDomain(db *gorm.DB, table string, role *model.OrgDomainView) error {
 
 func DeleteOrgDomain(db *gorm.DB, table, orgID, domain string) error {
 	delete := view.PrepareDeleteByKeys(table,
-		view.Key{Key: model.OrgDomainSearchKey(org_model.ORGDOMAINSEARCHKEY_DOMAIN), Value: domain},
-		view.Key{Key: model.OrgDomainSearchKey(org_model.ORGDOMAINSEARCHKEY_ORG_ID), Value: orgID},
+		view.Key{Key: model.OrgDomainSearchKey(org_model.OrgDomainSearchKeyDomain), Value: domain},
+		view.Key{Key: model.OrgDomainSearchKey(org_model.OrgDomainSearchKeyOrgID), Value: orgID},
 	)
 	return delete(db)
 }

internal/org/repository/view/org_member_view.go

@@ -11,8 +11,8 @@ import (
 func OrgMemberByIDs(db *gorm.DB, table, orgID, userID string) (*model.OrgMemberView, error) {
 	member := new(model.OrgMemberView)
 
-	orgIDQuery := &model.OrgMemberSearchQuery{Key: org_model.ORGMEMBERSEARCHKEY_ORG_ID, Value: orgID, Method: global_model.SEARCHMETHOD_EQUALS}
-	userIDQuery := &model.OrgMemberSearchQuery{Key: org_model.ORGMEMBERSEARCHKEY_USER_ID, Value: userID, Method: global_model.SEARCHMETHOD_EQUALS}
+	orgIDQuery := &model.OrgMemberSearchQuery{Key: org_model.OrgMemberSearchKeyOrgID, Value: orgID, Method: global_model.SearchMethodEquals}
+	userIDQuery := &model.OrgMemberSearchQuery{Key: org_model.OrgMemberSearchKeyUserID, Value: userID, Method: global_model.SearchMethodEquals}
 	query := view.PrepareGetByQuery(table, orgIDQuery, userIDQuery)
 	err := query(db, member)
 	return member, err
@@ -31,9 +31,9 @@ func OrgMembersByUserID(db *gorm.DB, table string, userID string) ([]*model.OrgM
 	members := make([]*model.OrgMemberView, 0)
 	queries := []*org_model.OrgMemberSearchQuery{
 		{
-			Key:    org_model.ORGMEMBERSEARCHKEY_USER_ID,
+			Key:    org_model.OrgMemberSearchKeyUserID,
 			Value:  userID,
-			Method: global_model.SEARCHMETHOD_EQUALS,
+			Method: global_model.SearchMethodEquals,
 		},
 	}
 	query := view.PrepareSearchQuery(table, model.OrgMemberSearchRequest{Queries: queries})

internal/org/repository/view/org_view.go

@@ -9,7 +9,7 @@ import (
 
 func OrgByID(db *gorm.DB, table, orgID string) (*model.OrgView, error) {
 	org := new(model.OrgView)
-	query := view.PrepareGetByKey(table, model.OrgSearchKey(org_model.ORGSEARCHKEY_ORG_ID), orgID)
+	query := view.PrepareGetByKey(table, model.OrgSearchKey(org_model.OrgSearchKeyOrgID), orgID)
 	err := query(db, org)
 	return org, err
 }
@@ -30,6 +30,6 @@ func PutOrg(db *gorm.DB, table string, org *model.OrgView) error {
 }
 
 func DeleteOrg(db *gorm.DB, table, orgID string) error {
-	delete := view.PrepareDeleteByKey(table, model.OrgSearchKey(org_model.ORGSEARCHKEY_ORG_ID), orgID)
+	delete := view.PrepareDeleteByKey(table, model.OrgSearchKey(org_model.OrgSearchKeyOrgID), orgID)
 	return delete(db)
 }