-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UI Polish, end to end submissions and voting
* Users who aren't signed in can't vote. * Signed in users can vote, vote detail is written to Riak. * Vote queries now come out of Riak thanks to 2i and map/red. * Sorting of submissions on the user page now works. TODO: just a little bit of polishing of code, commenting things and tidying up bits here and there. Then it's time to start work on the blog post which describes all the changes... there are a LOT!
- Loading branch information
Showing
16 changed files
with
560 additions
and
84 deletions.
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
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 |
|---|---|---|
|
|
@@ -19,6 +19,8 @@ | |
| -record(snippet, { | ||
| user_id, | ||
| key, | ||
| votes_left = 0, | ||
| votes_right = 0, | ||
| data | ||
| }). | ||
|
|
||
|
|
||
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,41 @@ | ||
| -module(csd_user). | ||
| -author('OJ Reeves <oj@buffered.io>'). | ||
|
|
||
| -export([get_id/1, fetch/1, save/1, to_user/2, from_json/1, to_json/1]). | ||
|
|
||
| -record(user, { | ||
| id, | ||
| name, | ||
| joined | ||
| }). | ||
|
|
||
| to_user(Id, Name) -> | ||
| #user{ | ||
| name = Name, | ||
| id = Id, | ||
| joined = csd_date:utc_now() | ||
| }. | ||
|
|
||
| get_id(#user{id=Id}) -> | ||
| Id. | ||
|
|
||
| fetch(Id) -> | ||
| csd_core_server:get_user(Id). | ||
|
|
||
| save(User=#user{}) -> | ||
| csd_core_server:save_user(User). | ||
|
|
||
| to_json(#user{name=N, id=T, joined=J}) -> | ||
| csd_json:to_json([{name, N}, {id, T}, {joined, J}], fun is_string/1). | ||
|
|
||
| from_json(UserJson) -> | ||
| User = csd_json:from_json(UserJson, fun is_string/1), | ||
| #user{ | ||
| id = proplists:get_value(User, id), | ||
| name = proplists:get_value(User, name), | ||
| joined = proplists:get_value(User, joined) | ||
| }. | ||
|
|
||
| is_string(name) -> true; | ||
| is_string(joined) -> true; | ||
| is_string(_) -> false. |
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,37 @@ | ||
| -module(csd_user_store). | ||
| -author('OJ Reeves <oj@buffered.io>'). | ||
|
|
||
| -export([fetch/2, save/2]). | ||
|
|
||
| -define(BUCKET, <<"user">>). | ||
|
|
||
| fetch(RiakPid, UserId) when is_integer(UserId) -> | ||
| fetch(RiakPid, integer_to_list(UserId)); | ||
| fetch(RiakPid, UserId) when is_list(UserId) -> | ||
| fetch(RiakPid, list_to_binary(UserId)); | ||
| fetch(RiakPid, UserId) when is_binary(UserId) -> | ||
| case csd_riak:fetch(RiakPid, ?BUCKET, UserId) of | ||
| {ok, RiakObj} -> | ||
| UserJson = csd_riak:get_value(RiakObj), | ||
| User = csd_user:from_json(UserJson), | ||
| {ok, User}; | ||
| {error, Reason} -> | ||
| {error, Reason} | ||
| end. | ||
|
|
||
| save(RiakPid, User) -> | ||
| IntId = csd_user:get_id(User), | ||
|
|
||
| % Id is int, so we need to conver to a binary | ||
| UserId = list_to_binary(integer_to_list(IntId)), | ||
|
|
||
| case csd_riak:fetch(RiakPid, ?BUCKET, UserId) of | ||
| {ok, RiakObj} -> | ||
| NewRiakObj = csd_riak:update(RiakObj, csd_user:to_json(User)), | ||
| ok = csd_riak:save(RiakPid, NewRiakObj), | ||
| {ok, User}; | ||
| {error, notfound} -> | ||
| NewRiakObj = csd_riak:create(?BUCKET, UserId, csd_user:to_json(User)), | ||
| ok = csd_riak:save(RiakPid, NewRiakObj), | ||
| {ok, User} | ||
| end. |
Oops, something went wrong.