split agregated MQ API to per module MQ API

src/accounts.erl

@@ -2,6 +2,7 @@
 -include_lib("kvs/include/accounts.hrl").
 -include_lib("kvs/include/membership_packages.hrl").
 -include_lib("kvs/include/log.hrl").
+-include_lib("kvs/include/feed_state.hrl").
 
 -export([debet/2, credit/2, balance/2, create_account/1, create_account/2]).
 -export([transaction/4, transaction/5]).
@@ -163,3 +164,13 @@ user_paid(UId) ->
         #user_purchase{top = undefined} -> false;
         _ -> true
     end.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_notice(["transaction", "user", User, "add_transaction"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): add_transaction: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),    
+    MP = Message,
+    kvs:add_transaction_to_user(User,MP),
+    {noreply, State};
+
+handle_notice(Route, Message, State) -> error_logger:info_msg("Unknown ACCOUNTS notice").

src/feed_server_api.erl

@@ -1,540 +1,5 @@
 -module(feed_server_api).
--include_lib("kvs/include/feeds.hrl").
--include_lib("kvs/include/users.hrl").
--include_lib("kvs/include/groups.hrl").
--include_lib("kvs/include/meetings.hrl").
--include_lib("kvs/include/log.hrl").
--include_lib("feed_server/include/feed_server.hrl").
-
--record(state, {owner = "feed_owner", feed, direct, type, cached_feed,cached_direct,cached_friends,cached_groups }).
-
-handle_notice(["feed", "delete", Owner] = Route, Message,
-              #state{owner = Owner} = State) ->
-    ?INFO("feed(~p): notification received: User=~p, Route=~p, Message=~p",
-          [self(), Owner, Route, Message]),
-    {stop, normal, State};
-
-handle_notice(["feed", "group", GroupId, "entry", EntryId, "add"] = Route,
-              [From|_] = Message,
-              #state{owner = Owner, feed = Feed} = State) ->
-    ?INFO("feed(~p): group message: Owner=~p, Route=~p, Message=~p",
-          [self(), Owner, Route, Message]),
-    [From, _Destinations, Desc, Medias] = Message,
-    feed:add_group_entry(Feed, From, [{GroupId, group}], EntryId,
-                         Desc, Medias, {group, direct}),
-    % statistics
-    case Owner == GroupId of
-        false -> ok;
-        true ->
-            {ok, Group} = kvs:get(group, GroupId),
-            GE = Group#group.entries_count,
-            kvs:put(Group#group{entries_count = GE+1}),
-            {ok, Subs} = kvs:get(group_subs, {From, GroupId}),
-            SE = Subs#group_subscription.user_posts_count,
-            kvs:put(Subs#group_subscription{user_posts_count = SE+1})
-    end,    
-
-    self() ! {feed_refresh,Feed,20},
-    {noreply, State};
-
-handle_notice(["feed", "user", FeedOwner, "entry", EntryId, "add"] = Route,
-              [From|_] = Message,
-              #state{owner = WorkerOwner, feed = Feed, direct = Direct} = State) ->
-    ?INFO("feed(~p): message: Owner=~p, Route=~p, Message=~p",
-          [self(), WorkerOwner, Route, Message]),
-    [From, Destinations, Desc, Medias] = Message,
-
-    if
-        %% user added message to own feed
-        FeedOwner == From andalso FeedOwner == WorkerOwner->
-            FilteredDst = [D || {_, group} = D <- Destinations],
-            feed:add_entry(Feed, From, FilteredDst, EntryId, Desc, Medias,
-                           {user, normal}), self() ! {feed_refresh,Feed,20};
-
-        %% friend added message to public feed
-        FeedOwner == From ->
-            feed:add_entry(Feed, From, [], EntryId, Desc, Medias,
-                           {user, normal}), self() ! {feed_refresh,Feed,20};
-
-        %% direct message to worker owner
-        FeedOwner == WorkerOwner ->
-            feed:add_direct_message(Direct, From, [{FeedOwner, user}],
-                                    EntryId, Desc, Medias), self() ! {direct_refresh,Direct,20};
-
-        %% user sent direct message to friend, add copy to his direct feed
-        From == WorkerOwner ->
-            feed:add_direct_message(Direct, WorkerOwner, Destinations,
-                                    EntryId, Desc, Medias), self() ! {direct_refresh,Direct,20};
-        true ->
-            ?INFO("not matched case in entry->add")
-    end,
-    
-    {noreply, State};
-
-% add/delete system message
-handle_notice(["feed", "user", _FeedOwner, "entry", EntryId, "add_system"] = Route, 
-              [From|_] = Message,
-              #state{owner = WorkerOwner, feed = Feed, direct = _Direct} = State) ->
-    ?INFO("feed(~p): system message: Owner=~p, Route=~p, Message=~p",
-          [self(), WorkerOwner, Route, Message]),
-    [From, _Destinations, Desc, Medias] = Message,
-
-    feed:add_entry(Feed, From, [], EntryId, Desc, Medias, {user, system}),
-    {noreply, State};
-
-handle_notice(["feed", "group", GroupId, "entry", EntryId, "add_system"] = Route,
-              [From|_] = Message,
-              #state{owner = Owner, feed = Feed} = State) ->
-    ?INFO("feed(~p): group system message: Owner=~p, Route=~p, Message=~p",
-          [self(), Owner, Route, Message]),
-    [From, _Destinations, Desc, Medias] = Message,
-    feed:add_group_entry(Feed, From, [{GroupId, group}], EntryId,
-                         Desc, Medias, {group, system}),
-    {noreply, State};
-
-handle_notice(["feed", "user", UId, "post_note"] = Route, Message, 
-        #state{owner = Owner, feed = Feed} = State) ->
-    ?INFO("feed(~p): post_note: Owner=~p, Route=~p, Message=~p", [self(), Owner, Route, Message]),
-    Note = Message,
-    Id = utils:uuid_ex(),
-    feed:add_entry(Feed, UId, [], Id, Note, [], {user, system_note}),
-    {noreply, State};
-
-handle_notice(["feed", _, WhoShares, "entry", NewEntryId, "share"],
-              #entry{entry_id = _EntryId, raw_description = Desc, media = Medias,
-                     to = Destinations, from = From} = E,
-              #state{feed = Feed, type = user} = State) ->
-    %% FIXME: sharing is like posting to the wall
-    ?INFO("share: ~p, WhoShares: ~p", [E, WhoShares]),
-%    NewEntryId = utils:uuid_ex(),
-    feed:add_shared_entry(Feed, From, Destinations, NewEntryId, Desc, Medias, {user, normal}, WhoShares),
-    {noreply, State};
-
-handle_notice(["feed", "group", _Group, "entry", EntryId, "delete"] = Route,
-              Message,
-              #state{owner = Owner, feed = Feed} = State) ->
-    ?INFO("feed(~p): remove entry: Owner=~p, Route=~p, Message=~p",
-          [self(), Owner, Route, Message]),
-    %% all group subscribers shold delete entry from their feeds
-    feed:remove_entry(Feed, EntryId),
-    self() ! {feed_refresh,Feed,20},
-    {noreply, State};
-
-handle_notice(["feed", _Type, EntryOwner, "entry", EntryId, "delete"] = Route,
-              Message,
-              #state{owner = Owner, feed=Feed, direct=Direct} = State) ->
-    case {EntryOwner, Message} of
-        %% owner of the antry has deleted entry, we will delete it too
-        {_, [EntryOwner|_]} ->
-            ?INFO("feed(~p): remove entry: Owner=~p, Route=~p, Message=~p",
-                  [self(), Owner, Route, Message]),
-            feeds:remove_entry(Feed, EntryId),
-            feeds:remove_entry(Direct, EntryId);
-        %% we are owner of the entry - delete it
-        {Owner, _} ->
-            ?INFO("feed(~p): remove entry: Owner=~p, Route=~p, Message=~p",
-                  [self(), Owner, Route, Message]),
-            feeds:remove_entry(Feed, EntryId),
-            feeds:remove_entry(Direct, EntryId);
-        %% one of the friends has deleted some entry from his feed. Ignore
-        _ ->
-            ok
-    end,
-    self() ! {feed_refresh, State#state.feed,20},
-    {noreply, State};
-
-handle_notice(["feed", _Type, _EntryOwner, "entry", EntryId, "edit"] = Route,
-              Message,
-              #state{owner = Owner, feed=Feed} = State) ->
-    [NewDescription|_] = Message,
-    ?INFO("feed(~p): edit: Owner=~p, Route=~p, Message=~p",
-          [self(), Owner, Route, Message]),
-
-    %% edit entry in all feeds
-    feeds:edit_entry(Feed, EntryId, NewDescription),
-
-    {noreply, State};
-
-handle_notice(["feed", _Type, _EntryOwner, "comment", CommentId, "add"] = Route,
-              Message,
-              #state{owner = Owner, feed=Feed} = State) ->
-    [From, EntryId, ParentComment, Content, Medias] = Message,
-
-    ?INFO("feed(~p): add comment: Owner=~p, Route=~p, Message=~p",
-          [self(), Owner, Route, Message]),
-    feeds:entry_add_comment(Feed, From, EntryId, ParentComment, CommentId, Content, Medias),
-    {noreply, State};
-
-handle_notice(["feed", "user", UId, "count_entry_in_statistics"] = Route, 
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): count_entry_in_statistics: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    case kvs:get(user_etries_count, UId) of
-        {ok, UEC} -> 
-            kvs:put(UEC#user_etries_count{
-                entries = UEC#user_etries_count.entries+1
-            }),
-            kvs_users:attempt_active_user_top(UId, UEC#user_etries_count.entries+1);
-        {error, notfound} ->
-            kvs:put(#user_etries_count{
-                user_id = UId,
-                entries = 1
-            }),
-            kvs_users:attempt_active_user_top(UId, 1)
-    end,
-    {noreply, State};
-
-handle_notice(["feed", "user", UId, "count_comment_in_statistics"] = Route, 
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): count_comment_in_statistics: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    case kvs:get(user_etries_count, UId) of
-        {ok, UEC} -> 
-            kvs:put(UEC#user_etries_count{
-                comments = UEC#user_etries_count.comments+1
-            });
-        {error, notfound} ->
-            kvs:put(#user_etries_count{
-                user_id = UId,
-                comments = 1
-            })
-    end,
-    {noreply, State};
-
-handle_notice(["db", "group", Owner, "put"] = Route, 
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): group put: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    kvs:put(Message),
-    {noreply, State};
-
-handle_notice(["db", "user", Owner, "put"] = Route, 
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): user put: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    kvs:put(Message),
-    {noreply, State};
-
-handle_notice(["system", "put"] = Route, 
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): system put: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    kvs:put(Message),
-    {noreply, State};
-
-handle_notice(["system", "delete"] = Route, 
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): system delete: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {Where, What} = Message,
-    kvs:delete(Where, What),
-    {noreply, State};
-
-
-handle_notice(["system", "create_group"] = Route, 
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): create_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {UId, GId, Name, Desc, Publicity} = Message,
-    FId = kvs:feed_create(),
-    CTime = erlang:now(),
-
-    Group =#group{username = GId,
-                              name = Name,
-                              description = Desc,
-                              publicity = Publicity,
-                              creator = UId,
-                              created = CTime,
-                              owner = UId,
-                              feed = FId},
-    kvs:put(Group),
-    mqs:notify([group, init], {GId, FId}),
-    kvs_users:init_mq(Group),
-
-
-    {noreply, State};
-
-handle_notice(["db", "group", GroupId, "update_group"] = Route, 
-    Message, #state{owner=ThisGroupOwner, type=Type} = State) ->
-    ?INFO("queue_action(~p): update_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, ThisGroupOwner}, Route, Message]),    
-    {_UId, _GroupUsername, Name, Description, Owner, Publicity} = Message,
-    SanePublicity = case Publicity of
-        "public" -> public;
-        "moderated" -> moderated;
-        "private" -> private;
-        _ -> undefined
-    end,
-    SaneOwner = case kvs:get(user, Owner) of
-        {ok, _} -> Owner;
-        _ -> undefined
-    end,
-    {ok, #group{}=Group} = kvs:get(group, GroupId),
-    NewGroup = Group#group{
-                   name = coalesce(Name,Group#group.name),
-                   description = coalesce(Description,Group#group.description),
-                   publicity = coalesce(SanePublicity,Group#group.publicity),
-                   owner = coalesce(SaneOwner,Group#group.owner)},
-    kvs:put(NewGroup),
-    {noreply, State};
-
-handle_notice(["db", "group", GId, "remove_group"] = Route, 
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): remove_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {_, Group} = groups:get_group(GId),
-    case Group of 
-        notfound -> ok;
-        _ ->
-            mqs:notify([feed, delete, GId], empty),
-            kvs:delete_by_index(group_subs, <<"group_subs_group_id_bin">>, GId),         
-            kvs:delete(feed, Group#group.feed),
-            kvs:delete(group, GId),
-            % unbind exchange
-            {ok, Channel} = mqs:open([]),
-            Routes = kvs_users:rk_group_feed(GId),
-            kvs_users:unbind_group_exchange(Channel, GId, Routes),
-            mqs_channel:close(Channel)
-    end,
-    {noreply, State};
-
-handle_notice(["subscription", "user", UId, "add_to_group"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): add_to_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {GId, Who, UType} = Message,
-
-    case kvs:get(group_subs, {UId, GId}) of
-        {error, notfound} ->
-            {R, Group} = kvs:get(group, GId),
-            case R of 
-                error -> ?INFO("Add to group failed reading group");
-                _ ->
-                    GU = Group#group.users_count,
-                    kvs:put(Group#group{users_count = GU+1})
-            end;
-        _ ->
-            ok
-    end,
-
-    OK = kvs:put({group_subs,UId,GId,Type,0}),
-
-%    add_to_group(Who, GId, UType),
-    ?INFO("add ~p to group ~p with Type ~p by ~p", [Who, GId,UType,UId]),
-    kvs_users:subscribemq(group, add, Who, GId),
-    {noreply, State};
-
-handle_notice(["subscription", "user", UId, "remove_from_group"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): remove_from_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),    
-    {GId} = Message,
-    ?INFO("remove ~p from group ~p", [UId, GId]),
-    kvs_users:remove_subscription_mq(group, UId, GId),
-
-    kvs:delete(group_subs, {UId, GId}),
-    {R, Group} = kvs:get(group, GId),
-    case R of
-        error -> ?INFO("Remove ~p from group failed reading group ~p", [UId, GId]);
-        _ ->
-            GU = Group#group.users_count,
-            kvs:put(Group#group{users_count = GU-1})
-    end,
-
-    {noreply, State};
-
-handle_notice(["subscription", "user", UId, "leave_group"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO(" queue_action(~p): leave_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {GId} = Message,
-    {R, Group} = kvs:get(group, GId),
-    case R of 
-        error -> ?ERROR(" Error reading group ~p for leave_group", [GId]);
-        ok ->
-            case Group#group.owner of
-                UId -> % User is owner, transfer ownership to someone else
-                    Members = groups:list_group_members(GId),
-                    case Members of
-                        [ FirstOne | _ ] ->
-                            ok = kvs:put(Group#group{owner = FirstOne}),
-                            mqs:notify(["subscription", "user", UId, "remove_from_group"], {GId});
-                        [] ->
-                            % Nobody left in group, remove group at all
-                            mqs:notify([db, group, GId, remove_group], [])
-                    end;
-                _ -> % Plain user removes -- just remove it
-                    mqs:notify(["subscription", "user", UId, "remove_from_group"], {GId})
-            end;
-        _ -> % user is just someone, remove it
-            mqs:notify(["subscription", "user", UId, "remove_from_group"], {GId})
-    end,
-    {noreply, State};
-
-handle_notice(["subscription", "user", UId, "subscribe"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO(" queue_action(~p): subscribe_user: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {Whom} = Message,
-    kvs_users:subscribe(UId, Whom),
-    {noreply, State};
-
-handle_notice(["subscription", "user", UId, "unsubscribe"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO(" queue_action(~p): remove_subscribe: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {Whom} = Message,
-    kvs_users:unsubscribe(UId, Whom),
-    {noreply, State};
-
-handle_notice(["subscription", "user", _UId, "update"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO(" queue_action(~p): update_user: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {NewUser} = Message,
-    kvs_users:update_user(NewUser),
-    {noreply, State};
-
-handle_notice(["gifts", "user", UId, "buy_gift"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO(" queue_action(~p): buy_gift: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {GId} = Message,
-    kvs_users:buy_gift(UId, GId),
-    {noreply, State};
-
-handle_notice(["gifts", "user", UId, "give_gift"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO(" queue_action(~p): give_gift: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {GId} = Message,
-    kvs_users:give_gift(UId, GId),
-    {noreply, State};
-
-handle_notice(["gifts", "user", UId, "mark_gift_as_deliving"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO(" queue_action(~p): mark_gift_as_deliving: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {GId, GTimestamp} = Message,
-    kvs_users:mark_gift_as_deliving(UId, GId, GTimestamp),
-    {noreply, State};
-
-
-handle_notice(["login", "user", UId, "update_after_login"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): update_after_login: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),    
-    Update =
-        case kvs_users:user_status(UId) of
-            {error, status_info_not_found} ->
-                #user_status{username = UId,
-                             last_login = erlang:now()};
-            {ok, UserStatus} ->
-                UserStatus#user_status{last_login = erlang:now()}
-        end,
-    kvs:put(Update),
-    {noreply, State};
-
-handle_notice(["invite", "user", UId, "add_invite_to_issuer"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): add_invite_to_issuer: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {O} = Message,
-    kvs:add_invite_to_issuer(UId, O),
-    {noreply, State};
-
-handle_notice(["system", "use_invite"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): use_invite: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {Code, UId} = Message,
-    invite:use_code(Code, UId),
-    {noreply, State};
-
-handle_notice(["tournaments", "user", UId, "create"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): create: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {TourName, TourDesc, {Y,M,D}, Time, MaxPlayers, Quota, Award, TourType, GameType} = Message,
-    case meetings:create(UId, TourName, TourDesc, {Y,M,D}, Time, MaxPlayers, Quota, Award, TourType, GameType) of
-        {error,X} -> 
-            ?ERROR("Error creating tournament: ~p", X);
-        TId -> skip
-    end,
-    {noreply, State};
-
-handle_notice(["tournaments", "user", UId, "create_and_join"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): create_and_join: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {TourName, TourDesc, {Y,M,D}, Time, MaxPlayers, Quota, Award, TourType, GameType} = Message,
-    case meetings:create(UId, TourName, TourDesc, {Y,M,D}, Time, MaxPlayers, Quota, Award, TourType, GameType) of
-        {error,X} -> 
-            ?ERROR("Error creating tournament: ~p", X);
-        TId -> 
-            meetings:join(UId, TId)
-    end,
-    {noreply, State};
-
-handle_notice(["likes", _, _, "add_like"] = Route,  % _, _ is here beacause of the same message used for comet update
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): add_like: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {UId, E} = Message,
-    {EId, FId} = E#entry.id,
-    feed:add_like(FId, EId, UId),
-    {noreply, State};
-
-handle_notice(["personal_score", "user", UId, "add"] = Route,
-    Message, #state{owner = Owner, type = Type} = State) ->
-    ?INFO("queue_action(~p): personal_score add: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {Games, Wins, Loses, Disconnects, Points, AverageTime} = Message,
-    scoring:add_personal_score(UId, Games, Wins, Loses, Disconnects, Points, AverageTime),
-    {noreply, State};
-
-handle_notice(["system", "add_package"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): add_package: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {MP} = Message,
-    case membership_packages:add_package(MP) of
-        {ok, _} ->
-            ok;
-        {error, Reason} ->
-            ?ERROR("Unable to add membership package: ~p, Reason ~p", [MP, Reason])
-    end,
-    {noreply, State};
-
-handle_notice(["purchase", "user", _, "set_purchase_state"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): set_purchase_state: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),  
-    {MPId, NewState, Info} = Message,
-    membership_packages:set_purchase_state(MPId, NewState, Info),
-    {noreply, State};
-
-handle_notice(["purchase", "user", _, "add_purchase"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): add_purchase: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),    
-    {MP} = Message,
-    membership_packages:add_purchase(MP),
-    {noreply, State};
-
-handle_notice(["transaction", "user", User, "add_transaction"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): add_transaction: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),    
-    MP = Message,
-    kvs:add_transaction_to_user(User,MP),
-    {noreply, State};
-
-handle_notice(["purchase", "user", _, "set_purchase_external_id"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): set_purchase_external_id: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {PurchaseId, TxnId} = Message,
-    membership_packages:set_purchase_external_id(PurchaseId, TxnId),
-    {noreply, State};
-
-handle_notice(["purchase", "user", _, "set_purchase_info"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): set_purchase_info: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {OrderId, Info} = Message,
-    membership_packages:set_purchase_info(OrderId, Info),
-    {noreply, State};
-
-handle_notice(["system", "tournament_join"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): tournament_join: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {UId, TId} = Message,
-    meetings:join(UId, TId),
-    {noreply, State};
-
-handle_notice(["system", "tournament_remove"] = Route,
-    Message, #state{owner = Owner, type =Type} = State) ->
-    ?INFO("queue_action(~p): tournament_remove: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
-    {UId, TId} = Message,
-    meetings:remove(UId, TId),
-    {noreply, State};
-
-handle_notice(Route, Message, #state{owner = User} = State) ->
-    ?DBG("feed(~p): unexpected notification received: User=~p, "
-              "Route=~p, Message=~p", [self(), User, Route, Message]),
-    {noreply, State}.
-
-
-coalesce(undefined, B) -> B;
-coalesce(A, _) -> A.
 
+handle([Module|Parameters],Message,State) ->
+    Module = list_to_atom(binary_to_list(term_to_binary(Module))),
+    Module:handle_notice([Module|Parameters],Message,State).

src/feeds.erl

@@ -3,6 +3,7 @@
 -include_lib("kvs/include/feeds.hrl").
 -include_lib("kvs/include/users.hrl").
 -include_lib("kvs/include/groups.hrl").
+-include_lib("kvs/include/feed_state.hrl").
 -include_lib("kvs/include/log.hrl").
 
 create() ->
@@ -224,3 +225,206 @@ test_likes() ->
         get_user_likes("derp", {1, 2}),
         get_user_likes_count("derp") == 4
     ].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_notice(["feed", "delete", Owner] = Route, Message,
+              #state{owner = Owner} = State) ->
+    ?INFO("feed(~p): notification received: User=~p, Route=~p, Message=~p",
+          [self(), Owner, Route, Message]),
+    {stop, normal, State};
+
+handle_notice(["feed", "group", GroupId, "entry", EntryId, "add"] = Route,
+              [From|_] = Message,
+              #state{owner = Owner, feed = Feed} = State) ->
+    ?INFO("feed(~p): group message: Owner=~p, Route=~p, Message=~p",
+          [self(), Owner, Route, Message]),
+    [From, _Destinations, Desc, Medias] = Message,
+    feed:add_group_entry(Feed, From, [{GroupId, group}], EntryId,
+                         Desc, Medias, {group, direct}),
+    % statistics
+    case Owner == GroupId of
+        false -> ok;
+        true ->
+            {ok, Group} = kvs:get(group, GroupId),
+            GE = Group#group.entries_count,
+            kvs:put(Group#group{entries_count = GE+1}),
+            {ok, Subs} = kvs:get(group_subs, {From, GroupId}),
+            SE = Subs#group_subscription.user_posts_count,
+            kvs:put(Subs#group_subscription{user_posts_count = SE+1})
+    end,    
+
+    self() ! {feed_refresh,Feed,20},
+    {noreply, State};
+
+handle_notice(["feed", "user", FeedOwner, "entry", EntryId, "add"] = Route,
+              [From|_] = Message,
+              #state{owner = WorkerOwner, feed = Feed, direct = Direct} = State) ->
+    ?INFO("feed(~p): message: Owner=~p, Route=~p, Message=~p",
+          [self(), WorkerOwner, Route, Message]),
+    [From, Destinations, Desc, Medias] = Message,
+
+    if
+        %% user added message to own feed
+        FeedOwner == From andalso FeedOwner == WorkerOwner->
+            FilteredDst = [D || {_, group} = D <- Destinations],
+            feed:add_entry(Feed, From, FilteredDst, EntryId, Desc, Medias,
+                           {user, normal}), self() ! {feed_refresh,Feed,20};
+
+        %% friend added message to public feed
+        FeedOwner == From ->
+            feed:add_entry(Feed, From, [], EntryId, Desc, Medias,
+                           {user, normal}), self() ! {feed_refresh,Feed,20};
+
+        %% direct message to worker owner
+        FeedOwner == WorkerOwner ->
+            feed:add_direct_message(Direct, From, [{FeedOwner, user}],
+                                    EntryId, Desc, Medias), self() ! {direct_refresh,Direct,20};
+
+        %% user sent direct message to friend, add copy to his direct feed
+        From == WorkerOwner ->
+            feed:add_direct_message(Direct, WorkerOwner, Destinations,
+                                    EntryId, Desc, Medias), self() ! {direct_refresh,Direct,20};
+        true ->
+            ?INFO("not matched case in entry->add")
+    end,
+    
+    {noreply, State};
+
+% add/delete system message
+handle_notice(["feed", "user", _FeedOwner, "entry", EntryId, "add_system"] = Route, 
+              [From|_] = Message,
+              #state{owner = WorkerOwner, feed = Feed, direct = _Direct} = State) ->
+    ?INFO("feed(~p): system message: Owner=~p, Route=~p, Message=~p",
+          [self(), WorkerOwner, Route, Message]),
+    [From, _Destinations, Desc, Medias] = Message,
+
+    feed:add_entry(Feed, From, [], EntryId, Desc, Medias, {user, system}),
+    {noreply, State};
+
+handle_notice(["feed", "group", GroupId, "entry", EntryId, "add_system"] = Route,
+              [From|_] = Message,
+              #state{owner = Owner, feed = Feed} = State) ->
+    ?INFO("feed(~p): group system message: Owner=~p, Route=~p, Message=~p",
+          [self(), Owner, Route, Message]),
+    [From, _Destinations, Desc, Medias] = Message,
+    feed:add_group_entry(Feed, From, [{GroupId, group}], EntryId,
+                         Desc, Medias, {group, system}),
+    {noreply, State};
+
+handle_notice(["feed", "user", UId, "post_note"] = Route, Message, 
+        #state{owner = Owner, feed = Feed} = State) ->
+    ?INFO("feed(~p): post_note: Owner=~p, Route=~p, Message=~p", [self(), Owner, Route, Message]),
+    Note = Message,
+    Id = utils:uuid_ex(),
+    feed:add_entry(Feed, UId, [], Id, Note, [], {user, system_note}),
+    {noreply, State};
+
+handle_notice(["feed", _, WhoShares, "entry", NewEntryId, "share"],
+              #entry{entry_id = _EntryId, raw_description = Desc, media = Medias,
+                     to = Destinations, from = From} = E,
+              #state{feed = Feed, type = user} = State) ->
+    %% FIXME: sharing is like posting to the wall
+    ?INFO("share: ~p, WhoShares: ~p", [E, WhoShares]),
+%    NewEntryId = utils:uuid_ex(),
+    feed:add_shared_entry(Feed, From, Destinations, NewEntryId, Desc, Medias, {user, normal}, WhoShares),
+    {noreply, State};
+
+handle_notice(["feed", "group", _Group, "entry", EntryId, "delete"] = Route,
+              Message,
+              #state{owner = Owner, feed = Feed} = State) ->
+    ?INFO("feed(~p): remove entry: Owner=~p, Route=~p, Message=~p",
+          [self(), Owner, Route, Message]),
+    %% all group subscribers shold delete entry from their feeds
+    feed:remove_entry(Feed, EntryId),
+    self() ! {feed_refresh,Feed,20},
+    {noreply, State};
+
+handle_notice(["feed", _Type, EntryOwner, "entry", EntryId, "delete"] = Route,
+              Message,
+              #state{owner = Owner, feed=Feed, direct=Direct} = State) ->
+    case {EntryOwner, Message} of
+        %% owner of the antry has deleted entry, we will delete it too
+        {_, [EntryOwner|_]} ->
+            ?INFO("feed(~p): remove entry: Owner=~p, Route=~p, Message=~p",
+                  [self(), Owner, Route, Message]),
+            feeds:remove_entry(Feed, EntryId),
+            feeds:remove_entry(Direct, EntryId);
+        %% we are owner of the entry - delete it
+        {Owner, _} ->
+            ?INFO("feed(~p): remove entry: Owner=~p, Route=~p, Message=~p",
+                  [self(), Owner, Route, Message]),
+            feeds:remove_entry(Feed, EntryId),
+            feeds:remove_entry(Direct, EntryId);
+        %% one of the friends has deleted some entry from his feed. Ignore
+        _ ->
+            ok
+    end,
+    self() ! {feed_refresh, State#state.feed,20},
+    {noreply, State};
+
+handle_notice(["feed", _Type, _EntryOwner, "entry", EntryId, "edit"] = Route,
+              Message,
+              #state{owner = Owner, feed=Feed} = State) ->
+    [NewDescription|_] = Message,
+    ?INFO("feed(~p): edit: Owner=~p, Route=~p, Message=~p",
+          [self(), Owner, Route, Message]),
+
+    %% edit entry in all feeds
+    feeds:edit_entry(Feed, EntryId, NewDescription),
+
+    {noreply, State};
+
+handle_notice(["feed", _Type, _EntryOwner, "comment", CommentId, "add"] = Route,
+              Message,
+              #state{owner = Owner, feed=Feed} = State) ->
+    [From, EntryId, ParentComment, Content, Medias] = Message,
+
+    ?INFO("feed(~p): add comment: Owner=~p, Route=~p, Message=~p",
+          [self(), Owner, Route, Message]),
+    feeds:entry_add_comment(Feed, From, EntryId, ParentComment, CommentId, Content, Medias),
+    {noreply, State};
+
+handle_notice(["feed", "user", UId, "count_entry_in_statistics"] = Route, 
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): count_entry_in_statistics: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    case kvs:get(user_etries_count, UId) of
+        {ok, UEC} -> 
+            kvs:put(UEC#user_etries_count{
+                entries = UEC#user_etries_count.entries+1
+            }),
+            kvs_users:attempt_active_user_top(UId, UEC#user_etries_count.entries+1);
+        {error, notfound} ->
+            kvs:put(#user_etries_count{
+                user_id = UId,
+                entries = 1
+            }),
+            kvs_users:attempt_active_user_top(UId, 1)
+    end,
+    {noreply, State};
+
+handle_notice(["feed", "user", UId, "count_comment_in_statistics"] = Route, 
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): count_comment_in_statistics: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    case kvs:get(user_etries_count, UId) of
+        {ok, UEC} -> 
+            kvs:put(UEC#user_etries_count{
+                comments = UEC#user_etries_count.comments+1
+            });
+        {error, notfound} ->
+            kvs:put(#user_etries_count{
+                user_id = UId,
+                comments = 1
+            })
+    end,
+    {noreply, State};
+
+handle_notice(["likes", _, _, "add_like"] = Route,  % _, _ is here beacause of the same message used for comet update
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): add_like: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {UId, E} = Message,
+    {EId, FId} = E#entry.id,
+    feed:add_like(FId, EId, UId),
+    {noreply, State};
+
+handle_notice(Route, Message, State) -> error_logger:info_msg("Unknown FEEDS notice").

src/kvs.erl

@@ -12,6 +12,7 @@
 -include_lib("kvs/include/log.hrl").
 -include_lib("kvs/include/membership_packages.hrl").
 -include_lib("stdlib/include/qlc.hrl").
+-include_lib("kvs/include/feed_state.hrl").
 -compile(export_all).
 
 -define(DBA, store_riak).
@@ -330,3 +331,59 @@ save(Key, Value) ->
 load(Key) ->
     {ok, Bin} = file:read_file(Key),
     binary_to_term(Bin).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_notice(["kvs", "group", Owner, "put"] = Route, 
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): group put: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    kvs:put(Message),
+    {noreply, State};
+
+handle_notice(["kvs", "user", Owner, "put"] = Route, 
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): user put: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    kvs:put(Message),
+    {noreply, State};
+
+handle_notice(["kvs","system", "put"] = Route, 
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): system put: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    kvs:put(Message),
+    {noreply, State};
+
+handle_notice(["kvs","system", "delete"] = Route, 
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): system delete: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {Where, What} = Message,
+    kvs:delete(Where, What),
+    {noreply, State};
+
+handle_notice(["db", "group", GroupId, "update_group"] = Route, 
+    Message, #state{owner=ThisGroupOwner, type=Type} = State) ->
+    ?INFO("queue_action(~p): update_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, ThisGroupOwner}, Route, Message]),    
+    {_UId, _GroupUsername, Name, Description, Owner, Publicity} = Message,
+    SanePublicity = case Publicity of
+        "public" -> public;
+        "moderated" -> moderated;
+        "private" -> private;
+        _ -> undefined
+    end,
+    SaneOwner = case kvs:get(user, Owner) of
+        {ok, _} -> Owner;
+        _ -> undefined
+    end,
+    {ok, #group{}=Group} = kvs:get(group, GroupId),
+    NewGroup = Group#group{
+                   name = coalesce(Name,Group#group.name),
+                   description = coalesce(Description,Group#group.description),
+                   publicity = coalesce(SanePublicity,Group#group.publicity),
+                   owner = coalesce(SaneOwner,Group#group.owner)},
+    kvs:put(NewGroup),
+    {noreply, State};
+
+handle_notice(Route, Message, State) -> error_logger:info_msg("Unknown KVS notice").
+
+coalesce(undefined, B) -> B;
+coalesce(A, _) -> A.

src/kvs_users.erl

@@ -3,6 +3,7 @@
 -include_lib("kvs/include/groups.hrl").
 -include_lib("kvs/include/accounts.hrl").
 -include_lib("kvs/include/log.hrl").
+-include_lib("kvs/include/feed_state.hrl").
 -include_lib("mqs/include/mqs.hrl").
 -compile(export_all).
 
@@ -196,3 +197,174 @@ retrieve_connections(Id,Type) ->
                                                     {Who,Paid,RealName};
 				               _ -> undefined end end || Who <- Sub],
 			   [X||X<-Data, X/=undefined] end end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_notice(["system", "create_group"] = Route, 
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): create_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {UId, GId, Name, Desc, Publicity} = Message,
+    FId = kvs:feed_create(),
+    CTime = erlang:now(),
+
+    Group =#group{username = GId,
+                              name = Name,
+                              description = Desc,
+                              publicity = Publicity,
+                              creator = UId,
+                              created = CTime,
+                              owner = UId,
+                              feed = FId},
+    kvs:put(Group),
+    mqs:notify([group, init], {GId, FId}),
+    kvs_users:init_mq(Group),
+
+
+    {noreply, State};
+
+handle_notice(["db", "group", GId, "remove_group"] = Route, 
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): remove_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {_, Group} = groups:get_group(GId),
+    case Group of 
+        notfound -> ok;
+        _ ->
+            mqs:notify([feed, delete, GId], empty),
+            kvs:delete_by_index(group_subs, <<"group_subs_group_id_bin">>, GId),         
+            kvs:delete(feed, Group#group.feed),
+            kvs:delete(group, GId),
+            % unbind exchange
+            {ok, Channel} = mqs:open([]),
+            Routes = kvs_users:rk_group_feed(GId),
+            kvs_users:unbind_group_exchange(Channel, GId, Routes),
+            mqs_channel:close(Channel)
+    end,
+    {noreply, State};
+
+handle_notice(["subscription", "user", UId, "add_to_group"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): add_to_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {GId, Who, UType} = Message,
+
+    case kvs:get(group_subs, {UId, GId}) of
+        {error, notfound} ->
+            {R, Group} = kvs:get(group, GId),
+            case R of 
+                error -> ?INFO("Add to group failed reading group");
+                _ ->
+                    GU = Group#group.users_count,
+                    kvs:put(Group#group{users_count = GU+1})
+            end;
+        _ ->
+            ok
+    end,
+
+    OK = kvs:put({group_subs,UId,GId,Type,0}),
+
+%    add_to_group(Who, GId, UType),
+    ?INFO("add ~p to group ~p with Type ~p by ~p", [Who, GId,UType,UId]),
+    kvs_users:subscribemq(group, add, Who, GId),
+    {noreply, State};
+
+handle_notice(["subscription", "user", UId, "remove_from_group"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): remove_from_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),    
+    {GId} = Message,
+    ?INFO("remove ~p from group ~p", [UId, GId]),
+    kvs_users:remove_subscription_mq(group, UId, GId),
+
+    kvs:delete(group_subs, {UId, GId}),
+    {R, Group} = kvs:get(group, GId),
+    case R of
+        error -> ?INFO("Remove ~p from group failed reading group ~p", [UId, GId]);
+        _ ->
+            GU = Group#group.users_count,
+            kvs:put(Group#group{users_count = GU-1})
+    end,
+
+    {noreply, State};
+
+handle_notice(["subscription", "user", UId, "leave_group"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO(" queue_action(~p): leave_group: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {GId} = Message,
+    {R, Group} = kvs:get(group, GId),
+    case R of 
+        error -> ?ERROR(" Error reading group ~p for leave_group", [GId]);
+        ok ->
+            case Group#group.owner of
+                UId -> % User is owner, transfer ownership to someone else
+                    Members = groups:list_group_members(GId),
+                    case Members of
+                        [ FirstOne | _ ] ->
+                            ok = kvs:put(Group#group{owner = FirstOne}),
+                            mqs:notify(["subscription", "user", UId, "remove_from_group"], {GId});
+                        [] ->
+                            % Nobody left in group, remove group at all
+                            mqs:notify([db, group, GId, remove_group], [])
+                    end;
+                _ -> % Plain user removes -- just remove it
+                    mqs:notify(["subscription", "user", UId, "remove_from_group"], {GId})
+            end;
+        _ -> % user is just someone, remove it
+            mqs:notify(["subscription", "user", UId, "remove_from_group"], {GId})
+    end,
+    {noreply, State};
+
+handle_notice(["subscription", "user", UId, "subscribe"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO(" queue_action(~p): subscribe_user: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {Whom} = Message,
+    kvs_users:subscribe(UId, Whom),
+    {noreply, State};
+
+handle_notice(["subscription", "user", UId, "unsubscribe"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO(" queue_action(~p): remove_subscribe: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {Whom} = Message,
+    kvs_users:unsubscribe(UId, Whom),
+    {noreply, State};
+
+handle_notice(["subscription", "user", _UId, "update"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO(" queue_action(~p): update_user: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {NewUser} = Message,
+    kvs_users:update_user(NewUser),
+    {noreply, State};
+
+handle_notice(["gifts", "user", UId, "buy_gift"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO(" queue_action(~p): buy_gift: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {GId} = Message,
+    kvs_users:buy_gift(UId, GId),
+    {noreply, State};
+
+handle_notice(["gifts", "user", UId, "give_gift"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO(" queue_action(~p): give_gift: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {GId} = Message,
+    kvs_users:give_gift(UId, GId),
+    {noreply, State};
+
+handle_notice(["gifts", "user", UId, "mark_gift_as_deliving"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO(" queue_action(~p): mark_gift_as_deliving: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {GId, GTimestamp} = Message,
+    kvs_users:mark_gift_as_deliving(UId, GId, GTimestamp),
+    {noreply, State};
+
+handle_notice(["login", "user", UId, "update_after_login"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): update_after_login: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),    
+    Update =
+        case kvs_users:user_status(UId) of
+            {error, status_info_not_found} ->
+                #user_status{username = UId,
+                             last_login = erlang:now()};
+            {ok, UserStatus} ->
+                UserStatus#user_status{last_login = erlang:now()}
+        end,
+    kvs:put(Update),
+    {noreply, State};
+
+handle_notice(Route, Message, State) -> error_logger:info_msg("Unknown USERS notice").

src/meetings.erl

@@ -1,6 +1,8 @@
 -module(meetings).
 -include_lib("kvs/include/users.hrl").
 -include_lib("kvs/include/meetings.hrl").
+-include_lib("kvs/include/feed_state.hrl").
+-include_lib("kvs/include/log.hrl").
 -compile(export_all).
 
 create_team(Name) ->
@@ -58,3 +60,45 @@ destroy(TID) -> kvs:delete_by_index(play_record, <<"play_record_tournament_bin">
 clear() -> [destroy(T#meeting.id) || T <- kvs:all(meeting)].
 lost() -> lists:usort([erlang:element(3, I) || I <- kvs:all(play_record)]).
 fake_join(TID) -> [meetings:join(auth:ima_gio2(X),TID)||X<-lists:seq(1,30)].
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_notice(["tournaments", "user", UId, "create"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): create: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {TourName, TourDesc, {Y,M,D}, Time, MaxPlayers, Quota, Award, TourType, GameType} = Message,
+    case meetings:create(UId, TourName, TourDesc, {Y,M,D}, Time, MaxPlayers, Quota, Award, TourType, GameType) of
+        {error,X} -> 
+            ?ERROR("Error creating tournament: ~p", X);
+        TId -> skip
+    end,
+    {noreply, State};
+
+handle_notice(["tournaments", "user", UId, "create_and_join"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): create_and_join: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {TourName, TourDesc, {Y,M,D}, Time, MaxPlayers, Quota, Award, TourType, GameType} = Message,
+    case meetings:create(UId, TourName, TourDesc, {Y,M,D}, Time, MaxPlayers, Quota, Award, TourType, GameType) of
+        {error,X} -> 
+            ?ERROR("Error creating tournament: ~p", X);
+        TId -> 
+            meetings:join(UId, TId)
+    end,
+    {noreply, State};
+
+handle_notice(["system", "tournament_join"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): tournament_join: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {UId, TId} = Message,
+    meetings:join(UId, TId),
+    {noreply, State};
+
+handle_notice(["system", "tournament_remove"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): tournament_remove: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {UId, TId} = Message,
+    meetings:remove(UId, TId),
+    {noreply, State};
+
+handle_notice(Route, Message, State) -> error_logger:info_msg("Unknown MEETINGS notice").
+

src/membership_packages.erl

@@ -3,6 +3,7 @@
 -include_lib("kvs/include/membership_packages.hrl").
 -include_lib("kvs/include/log.hrl").
 -include_lib("kvs/include/accounts.hrl").
+-include_lib("kvs/include/feed_state.hrl").
 -compile(export_all).
 
 -type package_id() :: integer().
@@ -196,3 +197,50 @@ check_conditions([], _, true) -> true.
 
 delete_package(PackageId) -> kvs:delete(membership_package, PackageId).
 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_notice(["system", "add_package"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): add_package: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {MP} = Message,
+    case membership_packages:add_package(MP) of
+        {ok, _} ->
+            ok;
+        {error, Reason} ->
+            ?ERROR("Unable to add membership package: ~p, Reason ~p", [MP, Reason])
+    end,
+    {noreply, State};
+
+handle_notice(["purchase", "user", _, "set_purchase_state"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): set_purchase_state: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),  
+    {MPId, NewState, Info} = Message,
+    membership_packages:set_purchase_state(MPId, NewState, Info),
+    {noreply, State};
+
+handle_notice(["purchase", "user", _, "add_purchase"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): add_purchase: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),    
+    {MP} = Message,
+    membership_packages:add_purchase(MP),
+    {noreply, State};
+
+handle_notice(["purchase", "user", _, "set_purchase_external_id"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): set_purchase_external_id: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {PurchaseId, TxnId} = Message,
+    membership_packages:set_purchase_external_id(PurchaseId, TxnId),
+    {noreply, State};
+
+handle_notice(["purchase", "user", _, "set_purchase_info"] = Route,
+    Message, #state{owner = Owner, type =Type} = State) ->
+    ?INFO("queue_action(~p): set_purchase_info: Owner=~p, Route=~p, Message=~p", [self(), {Type, Owner}, Route, Message]),
+    {OrderId, Info} = Message,
+    membership_packages:set_purchase_info(OrderId, Info),
+    {noreply, State};
+
+handle_notice(Route, Message, State) -> error_logger:info_msg("Unknown PAYMENTS notice").
+
+coalesce(undefined, B) -> B;
+coalesce(A, _) -> A.