unify routes

src/kvs_feed.erl

@@ -126,14 +126,14 @@ user_likes(UserId, {Page, PageAmount}) ->
 %% MQ API
 
 handle_notice([kvs_feed, _, Owner, entry, Eid, add],
-              [#entry{feed_id=Fid}=Entry|Rest],
+              [#entry{feed_id=Fid}=Entry],
               #state{owner=Owner} = S) ->
     case lists:keyfind(Fid,2, S#state.feeds) of false -> skip;
     {_,_} ->
-        error_logger:info_msg("[kvs_feed] => Add entry ~p to feed ~p. Ui payload:~p", [Eid, Fid, Rest]),
+        error_logger:info_msg("[kvs_feed] => Add entry ~p to feed ~p.", [Eid, Fid]),
         E = Entry#entry{id = {Eid, Fid}, entry_id = Eid, feeds=[comments]},
         Added = case kvs:add(E) of {error, Err}-> {error,Err}; {ok, En} -> En end,
-        msg:notify([kvs_feed, entry, {Eid, Fid}, added], [Added,Rest]) end,
+        msg:notify([kvs_feed, entry, {Eid, Fid}, added], [Added]) end,
     {noreply, S};
 
 handle_notice([kvs_feed,_, Owner, entry, {Eid, FeedName}, edit],
@@ -153,26 +153,26 @@ handle_notice([kvs_feed,_, Owner, entry, {Eid, FeedName}, edit],
     {noreply, S};
 
 handle_notice([kvs_feed, Owner, entry, delete],
-              [#entry{id=Id,feed_id=Fid}=E|Rest],
+              [#entry{id=Id,feed_id=Fid}=E],
               #state{owner=Owner, feeds=Feeds}=State) ->
     case lists:keyfind(Fid,2,Feeds) of false -> ok;
     _ ->
         error_logger:info_msg("[kvs_feed] => Remove entry ~p from feed ~p", [Id, Fid]),
         Removed = case kvs:remove(entry, Id) of {error,E}->{error, E}; ok -> E end,
-        msg:notify([kvs_feed, entry, Id, deleted], [Removed|Rest]) end,
+        msg:notify([kvs_feed, entry, Id, deleted], [Removed]) end,
 
     {noreply,State};
 
 handle_notice([kvs_feed, Owner, delete],
-              [#entry{entry_id=Eid}=E|Rest],
+              [#entry{entry_id=Eid}=E],
               #state{owner=Owner}=State) ->
     error_logger:info_msg("[kvs_feed] Delete all entries ~p ~p", [E#entry.entry_id, Owner]),
 
-    [msg:notify([kvs_feed, To, entry, delete],[Ed|Rest])
+    [msg:notify([kvs_feed, To, entry, delete],[Ed])
         || #entry{to={_, To}}=Ed <- kvs:all_by_index(entry, entry_id, Eid)],
 
     Removed = case kvs:remove(entry, {Eid, ?FEED(entry)}) of {error,E} -> {error,E}; ok -> E end,
-    msg:notify([kvs_feed, entry, {Eid, ?FEED(entry)}, deleted], [Removed|Rest]),
+    msg:notify([kvs_feed, entry, {Eid, ?FEED(entry)}, deleted], [Removed]),
 
     {noreply, State};
 

src/kvs_group.erl

@@ -86,7 +86,7 @@ leave(UserName,GroupName) ->
 
 approve_request(UserName, GroupName) -> add(UserName, GroupName, member).
 reject_request(UserName, GroupName) -> add(UserName, GroupName, req_rejected).
-member_type(UserName, GroupName, Type) -> mqs:notify(["subscription", "user", GroupName, "add_to_group"], {GroupName, UserName, Type}).
+member_type(UserName, GroupName, Type) -> msg:notify(["subscription", "user", GroupName, "add_to_group"], {GroupName, UserName, Type}).
 
 exists(GroupName) -> case kvs:get(group,GroupName) of {ok,_} -> true; _ -> false end.
 
@@ -114,7 +114,7 @@ user_has_access(UserName, GroupName) ->
                 {private, member} -> true;
                 _ -> false end end.
 
-handle_notice([kvs_group, Owner, create],
+handle_notice([kvs_group, Owner, add],
               [#group{}=Group],
               #state{owner=Owner}=State) ->
     error_logger:info_msg("[kvs_group] Create group ~p", [Owner]),
@@ -123,7 +123,7 @@ handle_notice([kvs_group, Owner, create],
         Params = [{id, Id}, {type, group}, {feeds, element(#iterator.feeds, G)}],
         case workers_sup:start_child(Params) of {error, E} -> {error, E}; _ -> G end end,
 
-    msg:notify([kvs_group, group, Group#group.id, created], [Created]),
+    msg:notify([kvs_group, group, Group#group.id, added], [Created]),
     {noreply, State};
 
 
@@ -163,7 +163,7 @@ handle_notice([kvs_group, join, Owner],
     join(Who, Owner),
     case lists:keyfind(FeedName, 1, Feeds) of false -> skip;
     {_,Fid} -> msg:notify([kvs_feed, group, Owner, entry, Who, add],
-                          [Entry#entry{id={Who, Fid},feed_id=Fid,to={group, Owner}}, {}, Fid]) end,
+                          [Entry#entry{id={Who, Fid},feed_id=Fid,to={group, Owner}}]) end,
 
 %    subscription_mq(group, add, UserName, GroupName),
     {noreply, State};
@@ -174,7 +174,7 @@ handle_notice([kvs_group, leave, Owner],
     error_logger:info_msg("[kvs_group] ~p leave group ~p", [Who, Owner]),
     leave(Who, Owner),
     case lists:keyfind(FeedName, 1, Feeds) of false -> skip;
-    {_,Fid} -> msg:notify([kvs_feed, group, Owner, entry, {Who, Fid}, delete], []) end,
+    {_,Fid} -> msg:notify([kvs_feed, group, Owner, entry, delete], [#entry{id={Who,Fid}, feed_id=Fid}]) end,
 
 %    subscription_mq(group, remove, UserName, GroupName),
     {noreply, State};

src/kvs_product.erl

@@ -96,7 +96,7 @@ handle_notice(["kvs_product", "unsubscribe", Who],
     subscription_mq(user, remove, Who, Whom),
     {noreply, State};
 
-handle_notice([kvs_product, Owner, create],
+handle_notice([kvs_product, Owner, add],
               [#product{}=Product, Recipients],
               #state{owner=Owner, feeds=Feeds}=State) ->
     error_logger:info_msg("[kvs_product] Create product ~p", [Owner]),
@@ -113,7 +113,7 @@ handle_notice([kvs_product, Owner, create],
             P
         end end,
 
-    msg:notify([kvs_product, product, Product#product.id, created], [Created]),
+    msg:notify([kvs_product, product, Product#product.id, added], [Created]),
     {noreply, State};
 
 handle_notice([kvs_product, Owner, update],