TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 19:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: all enums same style (#262)

Browse Source 
* fix: all enums same style

* fix: rename process to reduce

* add some missing enum renaming

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
2020-06-23 14:47:47 +02:00
committed by GitHub
parent c376b92315
commit 3cd3a238c2
152 changed files with 1026 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/view/failed_events.go
View File

@@ -39,18 +39,18 @@ func (req FailedEventSearchQuery) GetValue() interface{} {
type FailedEventSearchKey int32
const (
FAILEDEVENTKEY_UNDEFINED FailedEventSearchKey = iota
FAILEDEVENTKEY_VIEW_NAME
FAILEDEVENTKEY_FAILED_SEQUENCE
FailedEventKeyUndefined FailedEventSearchKey = iota
FailedEventKeyViewName
FailedEventKeyFailedSequence
)
type failedEventSearchKey FailedEventSearchKey
func (key failedEventSearchKey) ToColumnName() string {
switch FailedEventSearchKey(key) {
case FAILEDEVENTKEY_VIEW_NAME:
case FailedEventKeyViewName:
return "view_name"
case FAILEDEVENTKEY_FAILED_SEQUENCE:
case FailedEventKeyFailedSequence:
return "failed_sequence"
default:
return ""
@@ -70,8 +70,8 @@ func SaveFailedEvent(db *gorm.DB, table string, failedEvent *FailedEvent) error
func LatestFailedEvent(db *gorm.DB, table, viewName string, sequence uint64) (*FailedEvent, error) {
failedEvent := new(FailedEvent)
queries := []SearchQuery{
FailedEventSearchQuery{Key: FAILEDEVENTKEY_VIEW_NAME, Method: model.SEARCHMETHOD_EQUALS_IGNORE_CASE, Value: viewName},
FailedEventSearchQuery{Key: FAILEDEVENTKEY_FAILED_SEQUENCE, Method: model.SEARCHMETHOD_EQUALS, Value: sequence},
FailedEventSearchQuery{Key: FailedEventKeyViewName, Method: model.SearchMethodEqualsIgnoreCase, Value: viewName},
FailedEventSearchQuery{Key: FailedEventKeyFailedSequence, Method: model.SearchMethodEquals, Value: sequence},
}
query := PrepareGetByQuery(table, queries...)
err := query(db, failedEvent)

22
internal/view/query.go
View File

@@ -65,47 +65,47 @@ func SetQuery(query *gorm.DB, key ColumnKey, value interface{}, method model.Sea
}
switch method {
case model.SEARCHMETHOD_EQUALS:
case model.SearchMethodEquals:
query = query.Where(""+column+" = ?", value)
case model.SEARCHMETHOD_EQUALS_IGNORE_CASE:
case model.SearchMethodEqualsIgnoreCase:
valueText, ok := value.(string)
if !ok {
return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-idu8e", "Equal ignore case only possible for strings")
}
query = query.Where("LOWER("+column+") = LOWER(?)", valueText)
case model.SEARCHMETHOD_STARTS_WITH:
case model.SearchMethodStartsWith:
valueText, ok := value.(string)
if !ok {
return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-idu8e", "Starts with only possible for strings")
}
query = query.Where(column+" LIKE ?", valueText+"%")
case model.SEARCHMETHOD_STARTS_WITH_IGNORE_CASE:
case model.SearchMethodStartsWithIgnoreCase:
valueText, ok := value.(string)
if !ok {
return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-eidus", "Starts with ignore case only possible for strings")
}
query = query.Where("LOWER("+column+") LIKE LOWER(?)", valueText+"%")
case model.SEARCHMETHOD_CONTAINS:
case model.SearchMethodContains:
valueText, ok := value.(string)
if !ok {
return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-3ids", "Contains with only possible for strings")
}
query = query.Where(column+" LIKE ?", "%"+valueText+"%")
case model.SEARCHMETHOD_CONTAINS_IGNORE_CASE:
case model.SearchMethodContainsIgnoreCase:
valueText, ok := value.(string)
if !ok {
return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-eid73", "Contains with ignore case only possible for strings")
}
query = query.Where("LOWER("+column+") LIKE LOWER(?)", "%"+valueText+"%")
case model.SEARCHMETHOD_NOT_EQUALS:
case model.SearchMethodNotEquals:
query = query.Where(""+column+" <> ?", value)
case model.SEARCHMETHOD_GREATER_THAN:
case model.SearchMethodGreaterThan:
query = query.Where(column+" > ?", value)
case model.SEARCHMETHOD_LESS_THAN:
case model.SearchMethodLessThan:
query = query.Where(column+" < ?", value)
case model.SEARCHMETHOD_IS_ONE_OF:
case model.SearchMethodIsOneOf:
query = query.Where(column+" IN (?)", value)
case model.SEARCHMETHOD_LIST_CONTAINS:
case model.SearchMethodListContains:
valueText, ok := value.(string)
if !ok {
return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-Psois", "list contains only possible for strings")

4
internal/view/query_test.go
View File

@@ -94,7 +94,7 @@ func TestPrepareSearchQuery(t *testing.T) {
expectGetSearchRequestWithSearchQuery("TESTTABLE", TestSearchKey_ID.ToColumnName(), "=", "AggregateID", 2, 2),
args{
table: "TESTTABLE",
searchRequest: TestSearchRequest{queries: []SearchQuery{TestSearchQuery{key: TestSearchKey_ID, method: model.SEARCHMETHOD_EQUALS_IGNORE_CASE, value: "AggregateID"}}},
searchRequest: TestSearchRequest{queries: []SearchQuery{TestSearchQuery{key: TestSearchKey_ID, method: model.SearchMethodEqualsIgnoreCase, value: "AggregateID"}}},
},
res{
count: 2,
@@ -107,7 +107,7 @@ func TestPrepareSearchQuery(t *testing.T) {
expectGetSearchRequestWithAllParams("TESTTABLE", TestSearchKey_ID.ToColumnName(), "=", "AggregateID", "ASC", TestSearchKey_ID, 2, 2, 2, 5),
args{
table: "TESTTABLE",
searchRequest: TestSearchRequest{limit: 2, offset: 2, sortingColumn: TestSearchKey_ID, asc: true, queries: []SearchQuery{TestSearchQuery{key: TestSearchKey_ID, method: model.SEARCHMETHOD_EQUALS_IGNORE_CASE, value: "AggregateID"}}},
searchRequest: TestSearchRequest{limit: 2, offset: 2, sortingColumn: TestSearchKey_ID, asc: true, queries: []SearchQuery{TestSearchQuery{key: TestSearchKey_ID, method: model.SearchMethodEqualsIgnoreCase, value: "AggregateID"}}},
},
res{
count: 5,

18
internal/view/requests_test.go
View File

@@ -113,7 +113,7 @@ func TestPrepareGetByQuery(t *testing.T) {
expectGetByQuery("TESTTABLE", "test", "=", "VALUE"),
args{
table: "TESTTABLE",
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SEARCHMETHOD_EQUALS_IGNORE_CASE, value: "VALUE"},
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SearchMethodEqualsIgnoreCase, value: "VALUE"},
},
res{
result: Test{ID: "VALUE"},
@@ -126,7 +126,7 @@ func TestPrepareGetByQuery(t *testing.T) {
expectGetByQueryCaseSensitive("TESTTABLE", "test", "=", "VALUE"),
args{
table: "TESTTABLE",
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SEARCHMETHOD_EQUALS, value: "VALUE"},
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SearchMethodEquals, value: "VALUE"},
},
res{
result: Test{ID: "VALUE"},
@@ -139,7 +139,7 @@ func TestPrepareGetByQuery(t *testing.T) {
expectGetByQuery("TESTTABLE", "test", "LIKE", "VALUE%"),
args{
table: "TESTTABLE",
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SEARCHMETHOD_STARTS_WITH_IGNORE_CASE, value: "VALUE"},
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SearchMethodStartsWithIgnoreCase, value: "VALUE"},
},
res{
result: Test{ID: "VALUE"},
@@ -152,7 +152,7 @@ func TestPrepareGetByQuery(t *testing.T) {
expectGetByQueryCaseSensitive("TESTTABLE", "test", "LIKE", "VALUE%"),
args{
table: "TESTTABLE",
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SEARCHMETHOD_STARTS_WITH, value: "VALUE"},
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SearchMethodStartsWith, value: "VALUE"},
},
res{
result: Test{ID: "VALUE"},
@@ -165,7 +165,7 @@ func TestPrepareGetByQuery(t *testing.T) {
expectGetByQuery("TESTTABLE", "test", "LIKE", "%VALUE%"),
args{
table: "TESTTABLE",
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SEARCHMETHOD_CONTAINS_IGNORE_CASE, value: "VALUE"},
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SearchMethodContainsIgnoreCase, value: "VALUE"},
},
res{
result: Test{ID: "VALUE"},
@@ -178,7 +178,7 @@ func TestPrepareGetByQuery(t *testing.T) {
expectGetByQueryCaseSensitive("TESTTABLE", "test", "LIKE", "%VALUE%"),
args{
table: "TESTTABLE",
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SEARCHMETHOD_CONTAINS, value: "VALUE"},
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SearchMethodContains, value: "VALUE"},
},
res{
result: Test{ID: "VALUE"},
@@ -191,7 +191,7 @@ func TestPrepareGetByQuery(t *testing.T) {
expectGetByQueryErr("TESTTABLE", "test", "LIKE", "%VALUE%", gorm.ErrRecordNotFound),
args{
table: "TESTTABLE",
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SEARCHMETHOD_CONTAINS_IGNORE_CASE, value: "VALUE"},
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SearchMethodContainsIgnoreCase, value: "VALUE"},
},
res{
result: Test{ID: "VALUE"},
@@ -205,7 +205,7 @@ func TestPrepareGetByQuery(t *testing.T) {
expectGetByQueryErr("TESTTABLE", "test", "LIKE", "%VALUE%", gorm.ErrUnaddressable),
args{
table: "TESTTABLE",
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SEARCHMETHOD_CONTAINS_IGNORE_CASE, value: "VALUE"},
searchQuery: TestSearchQuery{key: TestSearchKey_TEST, method: model.SearchMethodContainsIgnoreCase, value: "VALUE"},
},
res{
result: Test{ID: "VALUE"},
@@ -219,7 +219,7 @@ func TestPrepareGetByQuery(t *testing.T) {
expectGetByQuery("TESTTABLE", "", "=", "VALUE"),
args{
table: "TESTTABLE",
searchQuery: TestSearchQuery{key: TestSearchKey_UNDEFINED, method: model.SEARCHMETHOD_EQUALS_IGNORE_CASE, value: "VALUE"},
searchQuery: TestSearchQuery{key: TestSearchKey_UNDEFINED, method: model.SearchMethodEqualsIgnoreCase, value: "VALUE"},
},
res{
result: Test{ID: "VALUE"},

8
internal/view/sequence.go
View File

@@ -17,15 +17,15 @@ type currentSequence struct {
type SequenceSearchKey int32
const (
SEQUENCESEARCHKEY_UNDEFINED SequenceSearchKey = iota
SEQUENCESEARCHKEY_VIEW_NAME
SequenceSearchKeyUndefined SequenceSearchKey = iota
SequenceSearchKeyViewName
)
type sequenceSearchKey SequenceSearchKey
func (key sequenceSearchKey) ToColumnName() string {
switch SequenceSearchKey(key) {
case SEQUENCESEARCHKEY_VIEW_NAME:
case SequenceSearchKeyViewName:
return "view_name"
default:
return ""
@@ -44,7 +44,7 @@ func SaveCurrentSequence(db *gorm.DB, table, viewName string, sequence uint64) e
func LatestSequence(db *gorm.DB, table, viewName string) (uint64, error) {
sequence := new(actualSequece)
query := PrepareGetByKey(table, sequenceSearchKey(SEQUENCESEARCHKEY_VIEW_NAME), viewName)
query := PrepareGetByKey(table, sequenceSearchKey(SequenceSearchKeyViewName), viewName)
err := query(db, sequence)
if err == nil {