-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: layer 1 desident dashboard, organize favorites by content type
- Loading branch information
Showing
13 changed files
with
369 additions
and
41 deletions.
There are no files selected for viewing
11 changes: 11 additions & 0 deletions
11
backend/migrations/00029_alter_open_content_favorites_table.sql
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 |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| -- +goose Up | ||
| -- +goose StatementBegin | ||
| ALTER TABLE public.open_content_favorites DROP COLUMN updated_at; | ||
| ALTER TABLE public.open_content_favorites DROP COLUMN deleted_at; | ||
| -- +goose StatementEnd | ||
|
|
||
| -- +goose Down | ||
| -- +goose StatementBegin | ||
| ALTER TABLE public.open_content_favorites ADD COLUMN updated_at timestamp with time zone; | ||
| ALTER TABLE public.open_content_favorites ADD COLUMN deleted_at timestamp with time zone; | ||
| -- +goose StatementEnd |
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
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 |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| package handlers | ||
|
|
||
| import ( | ||
| "UnlockEdv2/src/models" | ||
| "encoding/json" | ||
| "net/http" | ||
| "slices" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestHandleIndexOpenContent(t *testing.T) { | ||
| httpTests := []httpTest{ | ||
| {"TestIndexOpenContentAsAdmin", "admin", nil, http.StatusOK, ""}, | ||
| {"TestIndexOpenContentAsUser", "student", nil, http.StatusOK, ""}, | ||
| } | ||
| for _, test := range httpTests { | ||
| t.Run(test.testName, func(t *testing.T) { | ||
| req, err := http.NewRequest(http.MethodGet, "/api/open-content", nil) | ||
| if err != nil { | ||
| t.Fatalf("unable to create new request, error is %v", err) | ||
| } | ||
| handler := getHandlerByRole(server.handleIndexOpenContent, test.role) | ||
| rr := executeRequest(t, req, handler, test) | ||
| var all bool | ||
| if test.role == "admin" { | ||
| all = true | ||
| } | ||
| openContentProviders, err := server.Db.GetOpenContent(all) | ||
| if err != nil { | ||
| t.Fatalf("unable to get open content from db, error is %v", err) | ||
| } | ||
| data := models.Resource[[]models.OpenContentProvider]{} | ||
| received := rr.Body.String() | ||
| if err = json.Unmarshal([]byte(received), &data); err != nil { | ||
| t.Errorf("failed to unmarshal resource, error is %v", err) | ||
| } | ||
| for _, provider := range openContentProviders { | ||
| if !slices.ContainsFunc(data.Data, func(ocProvider models.OpenContentProvider) bool { | ||
| return ocProvider.ID == provider.ID | ||
| }) { | ||
| t.Error("providers not found, out of sync") | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestHandleGetUserFavoriteOpenContentGroupings(t *testing.T) { | ||
| httpTests := []httpTest{ | ||
| {"TestGetUserFavoriteOpenContentGroupingsAsUser", "student", map[string]any{"user_id": uint(4)}, http.StatusOK, ""}, | ||
| } | ||
| for _, test := range httpTests { | ||
| t.Run(test.testName, func(t *testing.T) { | ||
| req, err := http.NewRequest(http.MethodGet, "/api/open-content/favorite-groupings", nil) | ||
| if err != nil { | ||
| t.Fatalf("unable to create new request, error is %v", err) | ||
| } | ||
| handler := getHandlerByRole(server.handleGetUserFavoriteOpenContentGroupings, test.role) | ||
| rr := executeRequest(t, req, handler, test) | ||
| contentItems, err := server.Db.GetUserFavoriteGroupings(test.mapKeyValues["user_id"].(uint)) | ||
| if err != nil { | ||
| t.Fatalf("unable to get open content items from db, error is %v", err) | ||
| } | ||
| data := models.Resource[[]models.OpenContentItem]{} | ||
| received := rr.Body.String() | ||
| if err = json.Unmarshal([]byte(received), &data); err != nil { | ||
| t.Errorf("failed to unmarshal resource, error is %v", err) | ||
| } | ||
| for _, contentItem := range contentItems { | ||
| if !slices.ContainsFunc(data.Data, func(item models.OpenContentItem) bool { | ||
| return item.ContentId == contentItem.ContentId | ||
| }) { | ||
| t.Error("open content favorites not found, out of sync") | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestHandleGetUserFavoriteOpenContent(t *testing.T) { | ||
| httpTests := []httpTest{ | ||
| {"TestGetUserFavoriteOpenContentUser", "student", map[string]any{"user_id": uint(4), "page": 1, "per_page": 10}, http.StatusOK, ""}, | ||
| } | ||
| for _, test := range httpTests { | ||
| t.Run(test.testName, func(t *testing.T) { | ||
| req, err := http.NewRequest(http.MethodGet, "/api/open-content/favorites", nil) | ||
| if err != nil { | ||
| t.Fatalf("unable to create new request, error is %v", err) | ||
| } | ||
| handler := getHandlerByRole(server.handleGetUserFavoriteOpenContent, test.role) | ||
| rr := executeRequest(t, req, handler, test) | ||
| _, favorites, err := server.Db.GetUserFavorites(test.mapKeyValues["user_id"].(uint), test.mapKeyValues["page"].(int), test.mapKeyValues["per_page"].(int)) | ||
| if err != nil { | ||
| t.Fatalf("unable to get user favorites from db, error is %v", err) | ||
| } | ||
| data := models.PaginatedResource[models.OpenContentItem]{} | ||
| received := rr.Body.String() | ||
| if err = json.Unmarshal([]byte(received), &data); err != nil { | ||
| t.Errorf("failed to unmarshal resource, error is %v", err) | ||
| } | ||
| for _, favorite := range favorites { | ||
| if !slices.ContainsFunc(data.Data, func(item models.OpenContentItem) bool { | ||
| return favorite.ContentId == item.ContentId | ||
| }) { | ||
| t.Error("favorites not found, out of sync") | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.