Refactor domain assertions in graphql_domain_SUITE and update SQL query for domain selection

Author: Tomasz Wojcikowski

big_tests/tests/graphql_domain_SUITE.erl

@@ -194,7 +194,7 @@ get_all_domains_with_disabled(Config) ->
         #{<<"domain">> => ?EXAMPLE_DOMAIN, <<"hostType">> => ?HOST_TYPE, <<"status">> => <<"DISABLED">>},
         #{<<"domain">> => ?SECOND_EXAMPLE_DOMAIN, <<"hostType">> => ?HOST_TYPE, <<"status">> => <<"ENABLED">>}
     ],
-    ?assertEqual(lists:sort(Expected), lists:sort(ParsedResult)).
+    lists:foreach(fun(E) -> ?assert(lists:member(E, ParsedResult)) end, Expected).
 
 enable_domain(Config) ->
     Result = enable_domain(?EXAMPLE_DOMAIN, Config),
@@ -214,7 +214,7 @@ get_all_domains(Config) ->
         #{<<"domain">> => ?EXAMPLE_DOMAIN, <<"hostType">> => ?HOST_TYPE, <<"status">> => <<"ENABLED">>},
         #{<<"domain">> => ?SECOND_EXAMPLE_DOMAIN, <<"hostType">> => ?HOST_TYPE, <<"status">> => <<"ENABLED">>}
     ],
-    ?assertEqual(lists:sort(Expected), lists:sort(ParsedResult)).
+    lists:foreach(fun(E) -> ?assert(lists:member(E, ParsedResult)) end, Expected).
 
 get_domain_details(Config) ->
     Result = get_domain_details(?EXAMPLE_DOMAIN, Config),

src/domain/mongoose_domain_sql.erl

@@ -87,7 +87,7 @@ start(_) ->
               " WHERE domain_events.id >= ? AND domain_events.id <= ? "
               " ORDER BY domain_events.id ">>),
     prepare(domain_select_all, domain_settings, [],
-            <<"SELECT domain, host_type, status FROM domain_settings">>),
+            <<"SELECT domain, host_type, status FROM domain_settings order by domain">>),
     %% Admins
     prepare(domain_insert_admin, domain_admins, [domain, pass_details],
             <<"INSERT INTO domain_admins (domain, pass_details) VALUES (?, ?)">>),