extract to function

Author: t-aleksander

src-tauri/src/database/models/location.rs

@@ -1,4 +1,4 @@
-use std::fmt;
+use std::{fmt, i32};
 
 use serde::{Deserialize, Serialize};
 use sqlx::{prelude::Type, query, query_as, query_scalar, Error as SqlxError, SqliteExecutor};
@@ -93,19 +93,16 @@ impl Location<Id> {
     where
         E: SqliteExecutor<'e>,
     {
-        let max_mode = if include_service_locations {
-            ServiceLocationMode::AlwaysOn as i32
-        } else {
-            ServiceLocationMode::Disabled as i32
-        };
+        let max_service_location_mode =
+            Self::get_service_location_mode_filter(include_service_locations);
         query_as!(
           Self,
             "SELECT id, instance_id, name, address, pubkey, endpoint, allowed_ips, dns, network_id,\
             route_all_traffic, keepalive_interval, \
             location_mfa_mode \"location_mfa_mode: LocationMfaMode\", service_location_mode \"service_location_mode: ServiceLocationMode\" \
             FROM location WHERE service_location_mode <= $1 \
             ORDER BY name ASC;",
-            max_mode
+            max_service_location_mode
       )
         .fetch_all(executor)
         .await
@@ -167,19 +164,16 @@ impl Location<Id> {
     where
         E: SqliteExecutor<'e>,
     {
-        let max_mode = if include_service_locations {
-            ServiceLocationMode::AlwaysOn as i32
-        } else {
-            ServiceLocationMode::Disabled as i32
-        };
+        let max_service_location_mode =
+            Self::get_service_location_mode_filter(include_service_locations);
         query_as!(
             Self,
             "SELECT id \"id: _\", instance_id, name, address, pubkey, endpoint, allowed_ips, dns, \
             network_id, route_all_traffic, keepalive_interval, location_mfa_mode \"location_mfa_mode: LocationMfaMode\", service_location_mode \"service_location_mode: ServiceLocationMode\" \
             FROM location WHERE instance_id = $1 AND service_location_mode <= $2 \
             ORDER BY name ASC",
             instance_id,
-            max_mode
+            max_service_location_mode
         )
         .fetch_all(executor)
         .await
@@ -236,6 +230,16 @@ impl Location<Id> {
             LocationMfaMode::Internal | LocationMfaMode::External => true,
         }
     }
+
+    /// Returns a filter value that can be used in SQL queries like `service_location_mode <= ?` when querying locations
+    /// to exclude (<= 1) or include service locations (all service locations modes).
+    fn get_service_location_mode_filter(include_service_locations: bool) -> i32 {
+        if include_service_locations {
+            i32::MAX
+        } else {
+            ServiceLocationMode::Disabled as i32
+        }
+    }
 }
 
 impl Location<NoId> {