Pulling feat/list-content into develop #233
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| vendor/ | ||
| .plandex |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,8 +3,10 @@ package service | |
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "net" | ||
| "os" | ||
| "regexp" | ||
| "testing" | ||
| "time" | ||
|
|
||
|
|
@@ -24,6 +26,13 @@ import ( | |
| "google.golang.org/grpc/test/bufconn" | ||
| ) | ||
|
|
||
| type validateListContentsParams struct { | ||
| Assert *require.Assertions | ||
| Data []*content.ContentCollection_Data | ||
| NameRegex *regexp.Regexp | ||
| Namespace string | ||
| } | ||
|
|
||
| type MockMessage struct{} | ||
|
|
||
| func (msn *MockMessage) Publish(subject string, cont *content.Content) error { | ||
|
|
@@ -283,6 +292,106 @@ func TestDeleteContent(t *testing.T) { | |
| assert.NoError(err, "expect no error from deleting content") | ||
| } | ||
|
|
||
| func TestListContentsService(t *testing.T) { | ||
| t.Parallel() | ||
| client, assert := setup(t) | ||
|
|
||
| name, namespace := "catalog", "dsc" | ||
| storeMultipleContents(storeMultipleContentsParams{ | ||
| Client: client, | ||
| Assert: assert, | ||
| Count: 10, | ||
| Name: name, | ||
| Namespace: namespace, | ||
| }) | ||
| resp, err := client.ListContents( | ||
| context.Background(), | ||
| &content.ListParameters{Limit: 5}, | ||
| ) | ||
| assert.NoError(err, "expect no error from listing contents") | ||
| assert.Len(resp.Data, 5, "should return 5 contents") | ||
| nameRegex := regexp.MustCompile(fmt.Sprintf(`%s-\d+`, name)) | ||
| validateListContents(validateListContentsParams{ | ||
| Assert: assert, | ||
| Data: resp.Data, | ||
| NameRegex: nameRegex, | ||
| Namespace: namespace, | ||
| }) | ||
| assert.Greater( | ||
| resp.Meta.NextCursor, | ||
| int64(0), | ||
| "should have more record to fetch", | ||
| ) | ||
| resp2, err := client.ListContents( | ||
| context.Background(), | ||
| &content.ListParameters{Limit: 7, Cursor: resp.Meta.NextCursor}, | ||
| ) | ||
| assert.NoError(err, "expect no error from listing contents") | ||
| assert.Len(resp2.Data, 5, "should return 5 contents") | ||
| validateListContents(validateListContentsParams{ | ||
| Assert: assert, | ||
| Data: resp2.Data, | ||
| NameRegex: nameRegex, | ||
| Namespace: namespace, | ||
| }) | ||
| assert.Equal( | ||
| resp2.Meta.NextCursor, | ||
| int64(0), | ||
| "should not have any more record to fetch", | ||
| ) | ||
| resp2, err = client.ListContents( | ||
| context.Background(), | ||
| &content.ListParameters{Limit: 10}, | ||
| ) | ||
| assert.NoError(err, "expect no error from listing contents") | ||
| assert.Len(resp2.Data, 10, "should return 10 contents") | ||
| assert.Equal( | ||
| resp2.Meta.NextCursor, | ||
| int64(0), | ||
| "should not have any more record to fetch", | ||
| ) | ||
| } | ||
|
|
||
| func validateListContents(params validateListContentsParams) { | ||
| for _, cnt := range params.Data { | ||
| params.Assert.Regexp( | ||
| params.NameRegex, | ||
| cnt.Attributes.Name, | ||
| "name should match", | ||
| ) | ||
| params.Assert.Equal( | ||
| cnt.Attributes.Namespace, | ||
| params.Namespace, | ||
| "namespace should match", | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| type storeMultipleContentsParams struct { | ||
| Client content.ContentServiceClient | ||
| Assert *require.Assertions | ||
| Count int | ||
| Name string | ||
| Namespace string | ||
| } | ||
|
|
||
| func storeMultipleContents(params storeMultipleContentsParams) { | ||
| for i := 0; i < params.Count; i++ { | ||
| _, err := params.Client.StoreContent( | ||
| context.Background(), | ||
| &content.StoreContentRequest{ | ||
| Data: &content.StoreContentRequest_Data{ | ||
| Attributes: testutils.NewStoreContent( | ||
| fmt.Sprintf("%s-%d", params.Name, i), | ||
| params.Namespace, | ||
| ), | ||
| }, | ||
| }, | ||
| ) | ||
| params.Assert.NoError(err, "expect no error from storing content") | ||
| } | ||
| } | ||
|
|
||
| func testContentProperties( | ||
| assert *require.Assertions, | ||
| sct, nct *content.Content, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -216,3 +216,55 @@ func (arp *arangorepository) EditContent( | |
| func (arp *arangorepository) Dbh() *manager.Database { | ||
| return arp.database | ||
| } | ||
|
|
||
| func (arp *arangorepository) ListContents( | ||
| cursor int64, | ||
| limit int64, | ||
| filter string, | ||
| ) ([]*model.ContentDoc, error) { | ||
| bindVars := map[string]interface{}{ | ||
| "@content_collection": arp.content.Name(), | ||
| "limit": limit + 1, | ||
| } | ||
| if cursor != 0 { | ||
| bindVars["cursor"] = cursor | ||
| } | ||
| stmt := getListContentStatement(filter, cursor) | ||
| res, err := arp.database.SearchRows(stmt, bindVars) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error in searching rows %s", err) | ||
| } | ||
| if res.IsEmpty() { | ||
| return nil, &repository.ContentListNotFoundError{} | ||
| } | ||
|
|
||
| contentModel := make([]*model.ContentDoc, 0) | ||
| for res.Scan() { | ||
| m := &model.ContentDoc{} | ||
| if err := res.Read(m); err != nil { | ||
| return nil, fmt.Errorf( | ||
| "error in reading data to structure %s", | ||
| err, | ||
| ) | ||
| } | ||
| contentModel = append(contentModel, m) | ||
| } | ||
|
|
||
| return contentModel, nil | ||
| } | ||
|
|
||
| func getListContentStatement(filter string, cursor int64) string { | ||
| var stmt string | ||
| switch { | ||
| case len(filter) > 0 && cursor == 0: | ||
| stmt = fmt.Sprintf(ContentListFilter, filter) | ||
| case len(filter) > 0 && cursor != 0: | ||
| stmt = fmt.Sprintf(ContentListFilterWithCursor, filter) | ||
| case len(filter) == 0 && cursor == 0: | ||
| stmt = ContentList | ||
| case len(filter) == 0 && cursor != 0: | ||
| stmt = ContentListWithCursor | ||
| } | ||
|
|
||
| return stmt | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix
Metaassignment for consistency.Ensure that the
Metalimit is consistently assigned, even when the data slice is equal to the limit.