second part of code review

src/kvs_group.erl

@@ -9,12 +9,9 @@
 -include_lib("mqs/include/mqs.hrl").
 
 retrieve_groups(User) ->
-    ?INFO("retrieve group for user: ~p",[User]),
     case participate(User) of
          [] -> [];
-         Gs -> UC_GId = lists:sublist(lists:reverse(
-                              lists:sort([{members_count(GId), GId} || GId <- Gs])), 
-                                    20),
+         Gs -> UC_GId = lists:reverse(lists:sort([{members_count(GId), GId} || GId <- Gs])),
                Result = [begin case kvs:get(group,GId) of
                                    {ok, Group} -> {Group#group.name,GId,UC};
                                    _ -> undefined end end || {UC, GId} <- UC_GId],

src/kvs_meeting.erl

@@ -28,21 +28,17 @@ get(TID) ->
         {error, _} -> #meeting{} end.
 
 start(_TID) -> ok.
-join(UID, TID) -> kvs:join_tournament(UID, TID).
-remove(UID, TID) -> kvs:leave_tournament(UID, TID).
-waiting_player(TID) -> kvs:tournament_pop_waiting_player(TID).
-joined_users(TID) -> kvs:tournament_waiting_queue(TID).
+join(UID, TID) -> join_tournament(UID, TID).
+leave(UID, TID) -> leave_tournament(UID, TID).
 user_joined(TID, UID) -> 
-    AllJoined = [UId || #play_record{who = UId} <- joined_users(TID)],
+    AllJoined = [UId || #play_record{who = UId} <- tournament_users(TID)],
     lists:member(UID, AllJoined).
 all() -> kvs:all(tournament).
 user_is_team_creator(_UID, _TID) -> true.
-list_users_per_team(_TeamID) -> [].
 destroy(TID) -> kvs:delete_by_index(play_record, <<"play_record_tournament_bin">>, TID),
                           kvs:delete(tournament,TID).
 clear() -> [destroy(T#meeting.id) || T <- kvs:all(meeting)].
 lost() -> lists:usort([erlang:element(3, I) || I <- kvs:all(play_record)]).
-fake_join(TID) -> [kvs_meeting:join(auth:ima_gio2(X),TID)||X<-lists:seq(1,30)].
 
 handle_notice(["kvs_meeting", "user", UId, "create"] = Route,
     Message, #state{owner = Owner, type =Type} = State) ->
@@ -75,7 +71,7 @@ handle_notice(["kvs_meeting", "user", UId, "leave"] = 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,
-    kvs_meeting:remove(UId, TId),
+    kvs_meeting:leave(UId, TId),
     {noreply, State};
 
 handle_notice(Route, Message, State) -> error_logger:info_msg("Unknown MEETINGS notice").

src/kvs_payment.erl

@@ -50,18 +50,14 @@ add_payment(#payment{} = MP, State0, Info) ->
 
             Id = default_if_undefined(MP#payment.id, undefined, payment_id()),
             Purchase = MP#payment{id = Id, state = State, start_time = Start, state_log = StateLog},
-            %mqs:notify_purchase(Purchase),
-%            ?INFO("Payment added ~p ~p",[Purchase#payment.user_id, Purchase]),
-            add_to_user(Purchase#payment.user_id, Purchase)
-    end.
+            add_to_user(Purchase#payment.user_id, Purchase) end.
 
 add_to_user(UserId,Payment) ->
     {ok,Team} = case kvs:get(user_payment, UserId) of
                      {ok,T} -> {ok,T};
                      _ -> ?INFO("user_payment not found ~p. create top",[UserId]),
                           Head = #user_payment{ user = UserId, top = undefined},
-                          {kvs:put(Head),Head}
-                end,
+                          {kvs:put(Head),Head} end,
 
     EntryId = Payment#payment.id,
     Prev = undefined,
@@ -95,7 +91,7 @@ set_payment_state(MPId, NewState, Info) ->
               end,
     Purchase = MP#payment{state = NewState, end_time = EndTime, state_log = NewStateLog},
 
-%    mqs:notify_purchase(Purchase),
+    mqs:notify([kvs_payment,user,Purchase#payment.user_id,notify],Purchase),
     NewMP=MP#payment{state = NewState, end_time = EndTime, state_log = NewStateLog},
     kvs:put(NewMP),
 

src/kvs_purchase.erl

@@ -17,8 +17,8 @@ buy(UId, ProductId) ->
     kvs_accounts:transaction(UId, currency, -Price, "Buy " ++ Name ++ " for "++ integer_to_list(Price)),
     kvs:put(#user_product{username=UId, timestamp=now(), product_id = ProductId}).
 
-give(UId, PId) ->
-    kvs:put(#user_product{username=UId, timestamp=now(), product_id = PId}).
+give(UId, ProductId) ->
+    kvs:put(#user_product{username=UId, timestamp=now(), product_id = ProductId}).
 
 products(UId) -> DBA=?DBA, DBA:products(UId).