check active during reconcile (#984)

* check active during reconcile active was only being checked during device updates * explicitly mark devices as active in reconcile tests
helium · Jul 27, 2023 · 8f43c26 · 8f43c26
1 parent 8b9f52b
commit 8f43c26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/grpc/router_ics_eui_worker.erl b/src/grpc/router_ics_eui_worker.erl
@@ -424,11 +424,12 @@ get_local_eui_pairs(RouteID) ->
                     lists:filtermap(
                         fun(APIDevice) ->
                             OrgId = kvc:path([<<"organization_id">>], APIDevice),
+                            Active = kvc:path([<<"active">>], APIDevice, false),
 
-                            case lists:member(OrgId, UnfundedOrgs) of
-                                true ->
-                                    false;
+                            case Active andalso not lists:member(OrgId, UnfundedOrgs) of
                                 false ->
+                                    false;
+                                true ->
                                     <<AppEUI:64/integer-unsigned-big>> = lorawan_utils:hex_to_binary(
                                         kvc:path([<<"app_eui">>], APIDevice)
                                     ),

diff --git a/test/router_ics_eui_worker_SUITE.erl b/test/router_ics_eui_worker_SUITE.erl
@@ -357,6 +357,7 @@ reconcile_ignore_unfunded_orgs_test(_Config) ->
     },
     JsonDevices = [
         #{
+            <<"active">> => true,
             <<"app_eui">> => lorawan_utils:binary_to_hex(router_device:app_eui(D)),
             <<"dev_eui">> => lorawan_utils:binary_to_hex(router_device:dev_eui(D)),
             <<"organization_id">> => maps:get(organization_id, router_device:metadata(D))
@@ -493,6 +494,7 @@ reconcile_test(_Config) ->
         JSONDevices = lists:map(
             fun(X) ->
                 #{
+                    <<"active">> => true,
                     <<"app_eui">> => lorawan_utils:binary_to_hex(<<X:64/integer-unsigned-big>>),
                     <<"dev_eui">> => lorawan_utils:binary_to_hex(<<X:64/integer-unsigned-big>>)
                 }