Fixing CR comments

esl · Jul 19, 2022 · a761316 · a761316
1 parent 5a9e88a
commit a761316
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/priv/graphql/schemas/admin/admin_schema.gql b/priv/graphql/schemas/admin/admin_schema.gql
@@ -34,7 +34,7 @@ type AdminQuery{
   metric: MetricAdminQuery
   "Statistics"
   stats: StatsAdminQuery
-  "GDPR"
+  "Personal data management according to GDPR"
   gdpr: GdprAdminQuery
 }
 

diff --git a/src/gdpr_api.erl b/src/gdpr_api.erl
@@ -11,9 +11,15 @@
 
 -define(CMD_TIMEOUT, 300000).
 
--spec retrieve_all(jid:user(), jid:server(), Path :: binary()) -> ok | {error, Reason :: any()}.
+-spec retrieve_all(jid:user(), jid:server(), Path :: binary()) ->
+    ok | {user_does_not_exist_error, Reason :: string()}.
 retrieve_all(Username, Domain, ResultFilePath) ->
     JID = jid:make(Username, Domain, <<>>),
+    receive
+       _ -> ok
+    after
+        9000 -> ok
+    end,
     case user_exists(JID) of
         true ->
             DataFromModules = get_data_from_modules(JID),
@@ -39,7 +45,7 @@ retrieve_all(Username, Domain, ResultFilePath) ->
             remove_tmp_dir(TmpDir),
             ok;
         false ->
-            {error, "User does not exist"}
+            {user_does_not_exist_error, "User does not exist"}
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/graphql/admin/mongoose_graphql_gdpr_admin_query.erl b/src/graphql/admin/mongoose_graphql_gdpr_admin_query.erl
@@ -15,8 +15,7 @@ execute(_Ctx, gdpr, <<"retrievePersonalData">>, #{<<"username">> := User, <<"dom
                                                   <<"resultFilepath">> := FilePath}) ->
     try gdpr_api:retrieve_all(User, Domain, FilePath) of
         ok -> {ok, "Data retrieved"};
-        {error, String} -> make_error({user_does_not_exist_error, String},
-                                      #{user => User, domain => Domain})
+        Error -> make_error(Error, #{user => User, domain => Domain})
     catch
         _ -> make_error({internal_server_error, "Internal server error"},
                         #{user => User, domain => Domain, filePath => FilePath})