Merge pull request #4552 from esl/cached-affs-in-api

Use cached affiliations in MUC Light API

Author: pawlooss1

big_tests/tests/graphql_muc_light_SUITE.erl

@@ -9,7 +9,7 @@
                          get_coercion_err_msg/1, make_creds/1, get_unauthorized/1,
                          get_err_code/1, get_not_loaded/1]).
 
--import(config_parser_helper, [mod_config/2]).
+-import(config_parser_helper, [config/2]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("jid/include/jid.hrl").
@@ -209,12 +209,15 @@ end_per_suite(Config) ->
     escalus:end_per_suite(Config).
 
 required_modules(_) ->
-    Backend = mongoose_helper:mnesia_or_rdbms_backend(),
-    MucLightOpts = mod_config(mod_muc_light, #{backend => Backend,
-                                               rooms_in_rosters => true,
-                                               config_schema => custom_schema()}),
+    MucLightOpts = config([modules, mod_muc_light], muc_light_opts()),
     [{mod_muc_light, MucLightOpts}].
 
+muc_light_opts() ->
+    #{backend => mongoose_helper:mnesia_or_rdbms_backend(),
+      cache_affs => #{},
+      rooms_in_rosters => true,
+      config_schema => custom_schema()}.
+
 custom_schema() ->
     %% Should be sorted
     [{<<"background">>, <<>>, background, binary},

src/muc_light/mod_muc_light.erl

@@ -55,7 +55,8 @@
          room_exists/3,
          can_access_identity/3]).
 
--export([get_acc_room_affiliations/2]).
+-export([get_room_affiliations/2,
+         get_acc_room_affiliations/2]).
 
 %% For propEr
 -export([apply_rsm/3]).
@@ -559,6 +560,15 @@ acc_room_affiliations(Acc1, #{room := RoomJid}, _Extra) ->
 room_exists(_, #{room := RoomJid}, #{host_type := HostType}) ->
     {ok, mod_muc_light_db_backend:room_exists(HostType, jid:to_lus(RoomJid))}.
 
+-spec get_room_affiliations(mongooseim:host_type(), jid:jid()) ->
+    versioned_affs() | {error, not_exists}.
+get_room_affiliations(HostType, RoomJid) ->
+    Acc1 = mongoose_acc:new(#{location => ?LOCATION,
+                              lserver => RoomJid#jid.lserver,
+                              host_type => HostType}),
+    Acc2 = mongoose_hooks:acc_room_affiliations(Acc1, RoomJid),
+    get_room_affs_from_acc(Acc2, RoomJid).
+
 -spec get_acc_room_affiliations(mongoose_acc:t(), jid:jid()) ->
     {mongoose_acc:t(), versioned_affs() | {error, not_exists}}.
 get_acc_room_affiliations(Acc1, RoomJid) ->

src/muc_light/mod_muc_light_api.erl

@@ -319,7 +319,7 @@ return_info(#{room := RoomJID, aff_users := AffUsers, options := Config}) ->
     {ok, make_room(jid:to_binary(RoomJID), Config, AffUsers)}.
 
 do_get_room_aff(M = #{room := RoomJID, muc_host_type := HostType}) ->
-    case mod_muc_light_db_backend:get_aff_users(HostType, jid:to_lus(RoomJID)) of
+    case mod_muc_light:get_room_affiliations(HostType, RoomJID) of
         {ok, AffUsers, _Version} ->
             M#{aff_users => AffUsers};
         {error, not_exists} ->
@@ -368,10 +368,9 @@ make_room_config(Options) ->
 -spec get_room_user_aff(mongooseim:host_type(), jid:jid(), jid:jid()) ->
     {ok, aff()} | {error, room_not_found}.
 get_room_user_aff(HostType, RoomJID, UserJID) ->
-    RoomUS = jid:to_lus(RoomJID),
-    UserUS = jid:to_lus(UserJID),
-    case mod_muc_light_db_backend:get_aff_users(HostType, RoomUS) of
+    case mod_muc_light:get_room_affiliations(HostType, RoomJID) of
         {ok, Affs, _Version} ->
+            UserUS = jid:to_lus(UserJID),
             {ok, get_aff(UserUS, Affs)};
         {error, not_exists} ->
             {error, room_not_found}