Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/#118 #user preferences http #146

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 44 additions & 0 deletions internal/delivery/http/route_users.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ func (delivery *Delivery) getUsers(w http.ResponseWriter, r *http.Request) {
delivery.getUserFavorites(w, r, userID)
case "articles":
delivery.getUserArticles(w, r, userID)
case "preferences":
delivery.getUserPreferences(w, r, userID)
default:
delivery.logger.Noticef("user id: %v not exist but be queried, info: %v err: %v", userID, item, err)
w.WriteHeader(http.StatusNotFound)
Expand Down Expand Up @@ -133,3 +135,45 @@ func (delivery *Delivery) getUserArticles(w http.ResponseWriter, r *http.Request
delivery.logger.Errorf("getUserFavorites success response err: %w", err)
}
}

func (delivery *Delivery) getUserPreferences(w http.ResponseWriter, r *http.Request, userID string) {
token := delivery.getTokenFromRequest(r)

err := delivery.usecase.CheckPermission(token,
[]usecase.Permission{usecase.PermissionReadUserInformation},
map[string]string{
"user_id": userID,
})

if err != nil {
// TODO: record unauthorized access
w.WriteHeader(http.StatusUnauthorized)
return
}

dataMap, err := delivery.usecase.GetUserPreferences(context.Background(), userID)
if err != nil {
// TODO: record error
w.WriteHeader(http.StatusInternalServerError)
m := map[string]string{
"error": "find_userrec_error",
"error_description": err.Error(),
}
b, _ := json.MarshalIndent(m, "", " ")
_, err = w.Write(b)
if err != nil {
delivery.logger.Errorf("getUserPreferences error response err: %w", err)
}
return
}

responseMap := map[string]interface{}{
"data": dataMap,
}
responseByte, _ := json.MarshalIndent(responseMap, "", " ")

_, err = w.Write(responseByte)
if err != nil {
delivery.logger.Errorf("getUserPreferences success response err: %w", err)
}
}
8 changes: 8 additions & 0 deletions internal/delivery/http/route_users_mock_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ func (usecase *MockUsecase) GetUserInformation(ctx context.Context, userID strin
return result, nil
}

func (usecase *MockUsecase) GetUserPreferences(ctx context.Context, userID string) (map[string]string, error) {
result := map[string]string{
"favorite_no_highlight": "false",
}

return result, nil
}

func (usecase *MockUsecase) GetUserArticles(ctx context.Context, userID string) ([]interface{}, error) {
return nil, nil
}
Expand Down
40 changes: 40 additions & 0 deletions internal/delivery/http/route_users_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,46 @@ func TestGetUserFavorite(t *testing.T) {
}
}

func TestGetUserPreference(t *testing.T) {
userID := "id"
usecase := NewMockUsecase()
delivery := NewHTTPDelivery(usecase)
req, err := http.NewRequest("GET", "/v1/users/SYSOP/preferences", nil)
if err != nil {
t.Fatal(err)
}

token := usecase.CreateAccessTokenWithUsername(userID)
t.Logf("testing token: %v", token)
req.Header.Add("Authorization", "bearer"+token)

rr := httptest.NewRecorder()
r := http.NewServeMux()
r.HandleFunc("/v1/users/", delivery.routeUsers)
r.ServeHTTP(rr, req)

if status := rr.Code; status != http.StatusOK {
t.Errorf("handler returned wrong status code: got %v want %v", status, http.StatusOK)
}

responsedMap := map[string]interface{}{}
err = json.Unmarshal(rr.Body.Bytes(), &responsedMap)
if err != nil {
t.Errorf("get unexpected json: %w", err)
}

t.Logf("got response %v", rr.Body.String())
responsedData := responsedMap["data"].(map[string]interface{})
firstItem := responsedData["favorite_no_highlight"]

expectedValue := "false"
if firstItem != expectedValue {
t.Errorf("handler returned unexpected body, favorite_no_highlight not match: got %v want value %v",
firstItem, expectedValue)
}

}

func TestGetUserArticles(t *testing.T) {

userID := "id"
Expand Down
1 change: 1 addition & 0 deletions internal/usecase/usecase.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type Usecase interface {
GetUserInformation(ctx context.Context, userID string) (map[string]interface{}, error) // FIXME: use concrete type rather than map[string]interface{}
// GetUserArticles returns user's articles
GetUserArticles(ctx context.Context, userID string) ([]interface{}, error) // FIXME: use concrete type rather than []interface{}
GetUserPreferences(ctx context.Context, userID string) (map[string]string, error)

// board.go
// GetBoardByID returns board record of board id
Expand Down
33 changes: 33 additions & 0 deletions internal/usecase/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,39 @@ func (usecase *usecase) GetUserArticles(ctx context.Context, userID string) ([]i
return dataItems, nil
}

func (usecase *usecase) GetUserPreferences(ctx context.Context, userID string) (map[string]string, error) {
userrec, err := usecase.GetUserByID(ctx, userID)
if err != nil {
return nil, fmt.Errorf("get userrec for %s failed", userID)
}
user := userrec.(repository.BBSUserRecord)

// TODO: Create a mock repository to pass the values
result := map[string]string{
"favorite_no_highlight": user.Nickname(),
"favorite_add_new": "No value",
"friend": "No value",
"board_sort": "No value",
"ad_banner": "No value",
"ad_banner_user_song": "No value",
"dbcs_aware": "No value",
"dbcs_no_interupting_escape": "No value",
"dbcs_drop_repeat": "No value",
"no_modification_mark": "No value",
"colored_modification_mark": "No value",
"default_backup": "No value",
"new_angel_pager": "No value",
"reject_outside_mail": "No value",
"secure_login": "No value",
"foreign": "No value",
"live_right": "No value",
"menu_lightbar": "No value",
"cursor_ascii": "No value",
"pager_ui": "No value",
}
return result, nil
}

func (usecase *usecase) parseFavoriteFolderItem(recs []bbs.FavoriteRecord) []interface{} {
dataItems := []interface{}{}
for _, item := range recs {
Expand Down