FIX: small code improvements, removed unnecessary dependency and imports

Cargo.lock

@@ -323,16 +323,6 @@ dependencies = [
  "yaml-rust",
 ]
 
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
-dependencies = [
- "cfg-if 0.1.10",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "const_fn"
 version = "0.4.8"
@@ -553,19 +543,6 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
-[[package]]
-name = "email-address-parser"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568e19448575a5c6782d2d8d61985998fb8d60fc3af4f69bdc41351325908b3b"
-dependencies = [
- "console_error_panic_hook",
- "pest",
- "pest_derive",
- "quick-xml",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.28"
@@ -599,7 +576,6 @@ dependencies = [
  "config",
  "diesel",
  "diesel_geometry",
- "email-address-parser",
  "env_logger",
  "iban_validate",
  "lettre",
@@ -1731,15 +1707,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
-[[package]]
-name = "quick-xml"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc440ee4802a86e357165021e3e255a9143724da31db1e2ea540214c96a0f82"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.9"

Cargo.toml

@@ -20,7 +20,6 @@ chrono-tz = "0.6"
 rand = "0.8.5"
 iban_validate = "4.0.1"
 base64 = "0.13.0"
-email-address-parser = "1.0.1"
 bigdecimal = "0.1.2"
 lettre = { version = "0.10.0-rc.4", features = ["tokio1", "tokio1-native-tls"] }
 

src/database/controller/events.rs

@@ -11,7 +11,6 @@ use crate::database::controller::events::templates::vehicle_positions::get_eu_ve
 use crate::database::model::events::{Event, EventType, EventUnitInstancePosition, EventUnitInstanceVehiclePosition, EventUnitPosition, EventUnitTemplate, EventUnitVehiclePosition};
 use crate::diesel::QueryDsl;
 use crate::helper::settings::Settings;
-use crate::modules::api::events::instances::read::PositionInstance;
 use crate::schema::eu_position_instances::dsl::eu_position_instances;
 use crate::schema::eu_positions_templates;
 
@@ -491,7 +490,7 @@ pub fn add_position_instances_for_instance(settings: &State<Settings>, instance_
     let connection = establish_connection(settings);
 
     for position in positions{
-        for i in 1..position.num+1{
+        for _i in 1..position.num+1{
             match diesel::insert_into(eu_position_instances).values((instance_id.eq(instance_id2), position_id.eq(position.position.entity_id))).execute(&connection){
                 Ok(_) => {debug!("Inserted new eu_position_instance with position_id {} and instance_id {}.", position.position.entity_id, instance_id2)},
                 Err(e) => return Err(e)

src/database/controller/events/instances/instance_positions.rs

@@ -1,6 +1,5 @@
 use chrono::Utc;
-use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl, sql_query};
-use diesel::sql_types::{Jsonb, Nullable, SmallInt, Text, Timestamp, Uuid};
+use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl};
 use rocket::State;
 
 use crate::database::controller::connector::establish_connection;
@@ -93,14 +92,14 @@ pub fn set_missing_real_times_to_instance_times(settings: &State<Settings>, even
 
     let connection = establish_connection(settings);
     match sql_query("UPDATE eu_position_instances AS epi SET real_start_time = ei.real_start_time FROM eu_instances AS ei WHERE epi.real_start_time IS NULL AND ei.instance_id = epi.instance_id AND ei.event_id = $1;").bind::<diesel::sql_types::Uuid, _>(event).execute(&connection) {
-        Ok(res) => (),
+        Ok(_res) => (),
         Err(e) => {
             error!("Couldn't set missing real times to planned times for position_instances: {}", e);
             return Err(e)
         }
     }
     match sql_query("UPDATE eu_position_instances AS epi SET real_end_time = ei.real_end_time FROM eu_instances AS ei WHERE epi.real_end_time IS NULL AND ei.instance_id = epi.instance_id AND ei.event_id = $1;").bind::<diesel::sql_types::Uuid, _>(event).execute(&connection) {
-        Ok(res) => Ok(()),
+        Ok(_res) => Ok(()),
         Err(e) => {
             error!("Couldn't set missing real times to planned times for position_instances: {}", e);
             Err(e)

src/database/controller/member_update.rs

@@ -1,3 +1,11 @@
+use std::str::FromStr;
+
+use chrono::NaiveDate;
+use diesel::{ExpressionMethods, RunQueryDsl};
+use iban::Iban;
+use rocket::State;
+use uuid::Uuid;
+
 use crate::database::controller::connector::establish_connection;
 use crate::database::controller::member_insert::insert_address;
 use crate::database::model::addresses::Address;
@@ -7,13 +15,8 @@ use crate::helper::settings::Settings;
 use crate::modules::member_management::model::member::{Member, MemberProfileForm};
 use crate::schema::addresses::dsl::{addresses, id};
 use crate::schema::members;
-use chrono::NaiveDate;
-use diesel::{ExpressionMethods, RunQueryDsl};
-use rocket::State;
-use std::str::FromStr;
-use uuid::Uuid;
-use iban::Iban;
 
+//TODO: refactor
 pub fn update_member(
     settings: &State<Settings>,
     member_form: MemberProfileForm,

src/helper/mail_queue/mailer.rs

@@ -1,8 +1,5 @@
-use lettre::{AsyncSmtpTransport, Message, Tokio1Executor};
-use lettre::message::MessageBuilder;
+use lettre::{AsyncSmtpTransport, Tokio1Executor};
 use lettre::transport::smtp::authentication::Credentials;
-use rocket::futures::SinkExt;
-use rocket::State;
 
 use crate::Settings;
 

src/helper/mail_queue/queue.rs

@@ -1,9 +1,8 @@
 use std::collections::VecDeque;
-use std::io::{Read, Write};
 use std::ops::Add;
 use std::sync::RwLock;
 
-use chrono::{DateTime, Duration, NaiveDateTime, Utc};
+use chrono::{Duration, Utc};
 use lettre::Message;
 
 use crate::helper::mail_queue::worker::send_mail;

src/helper/mail_queue/worker.rs

@@ -1,6 +1,3 @@
-use std::process::Command;
-
-use email_address_parser::EmailAddress;
 use lettre::{AsyncTransport, Message};
 
 use crate::helper::mail_queue::mailer::setup;

src/helper/settings.rs

@@ -1,6 +1,6 @@
 use std::env;
 
-use config::{Config, ConfigError, Environment, File};
+use config::{Config, ConfigError};
 
 #[derive(Debug, Deserialize, Default, Clone)]
 pub struct Database {

src/modules/api/billing_rates/read.rs

@@ -1,6 +1,3 @@
-use std::convert::TryInto;
-use std::ops::Deref;
-
 use rocket::serde::json::Json;
 use rocket::State;
 

src/modules/api/events/instances/read.rs

@@ -4,7 +4,7 @@ use rocket::State;
 use crate::database::controller::events::{get_eu_position, get_instance_vehicle_positions, get_position_instances};
 use crate::database::controller::events::instances::instance_positions::RawPositionInstance;
 use crate::database::controller::events::instances::instances::{get_instances, RawEventUnitInstance};
-use crate::database::model::events::{EventUnitInstanceDeprecated, EventUnitInstancePosition, EventUnitInstanceVehiclePosition};
+use crate::database::model::events::EventUnitInstanceVehiclePosition;
 use crate::helper::session_cookies::model::SessionCookie;
 use crate::helper::settings::Settings;
 use crate::helper::time::utc_to_local_user_time;
@@ -12,7 +12,6 @@ use crate::helper::translate_diesel_error::translate_diesel;
 use crate::modules::api::member_management::controller::parser::{parse_member_cookie, parse_uuid_string};
 use crate::modules::api::model::api_outcome::{ApiError, ApiErrorWrapper};
 use crate::modules::api::personnel_billing::calculation::calculate_hours;
-use crate::schema::personnel_billing::fulfilled_time;
 
 /// This struct contains RawEventUnitInstance data but converts all UTC DateTimes to local time
 #[derive(Queryable, Clone, Deserialize, Serialize, )]
@@ -92,7 +91,7 @@ impl PositionInstance {
         };
         let position_data = match get_eu_position(settings, raw.position_id) {
             Ok(position) => position,
-            Err(e) => { //TODO: distinguish personal & vehicle positions
+            Err(_e) => { //TODO: distinguish personal & vehicle positions
                 return Err(())
             }
         };

src/modules/api/events/instances/update.rs

@@ -5,7 +5,7 @@ use rocket::State;
 
 use crate::database::controller::events::{change_position_instances, get_event, get_position_instance};
 use crate::database::controller::events::instances::instance_positions::RawPositionInstanceChangeset;
-use crate::database::controller::events::instances::instances::{get_instance, get_instances, RawEventUnitInstanceChangeset, update_instance};
+use crate::database::controller::events::instances::instances::{get_instance, RawEventUnitInstanceChangeset, update_instance};
 use crate::helper::serde_patch::Patch;
 use crate::helper::session_cookies::model::SessionCookie;
 use crate::helper::settings::Settings;

src/modules/api/events/read.rs

@@ -2,8 +2,8 @@ use chrono::{Duration, Local, NaiveDateTime};
 use rocket::serde::json::Json;
 use rocket::State;
 
-use crate::database::controller::billing::states::{get_billing_states_for_event, get_min_billing_states_for_event};
-use crate::database::controller::events::{get_event, get_event_count, get_events, get_events_for_member_in_future, get_instance_positions_name_description, get_position_instances};
+use crate::database::controller::billing::states::get_min_billing_states_for_event;
+use crate::database::controller::events::{get_event, get_event_count, get_events, get_events_for_member_in_future, get_instance_positions_name_description};
 use crate::database::controller::events::instances::instances::get_instances;
 use crate::database::model::events::Event;
 use crate::helper::session_cookies::model::SessionCookie;

src/modules/api/events/requests/update.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use chrono::NaiveDateTime;
 use lettre::Message;
-use lettre::message::{header, Mailbox};
+use lettre::message::header;
 use rocket::serde::json::Json;
 use rocket::State;
 

src/modules/api/events/update.rs

@@ -1,17 +1,14 @@
 use std::sync::Arc;
 
 use chrono::NaiveDateTime;
-use diesel::expression::ops::Mul;
-use lettre::{AsyncTransport, Message};
+use lettre::Message;
 use lettre::message::{Attachment, MultiPart, SinglePart};
 use lettre::message::header::ContentType;
 use rocket::serde::json::Json;
 use rocket::State;
 
-use crate::database::controller::billing::states::{get_billing_state, get_billing_states};
+use crate::database::controller::billing::states::get_billing_state;
 use crate::database::controller::events::{change_event, finish_billing, get_event};
-use crate::database::controller::events::instances::instance_positions::RawPositionInstanceChangeset;
-use crate::database::controller::events::instances::instances::get_instances;
 use crate::database::controller::members::check_access_to_resource;
 use crate::database::model::events::Event;
 use crate::helper::session_cookies::model::SessionCookie;
@@ -21,7 +18,7 @@ use crate::MailQueue;
 use crate::modules::api::events::create::CreateEventData;
 use crate::modules::api::member_management::controller::parser::{parse_member_cookie, parse_option_uuid, parse_uuid_string};
 use crate::modules::api::model::api_outcome::{ApiError, ApiErrorWrapper};
-use crate::modules::event_billing::generate_billing_csv::{generate_billing_csv, save_billing_csv};
+use crate::modules::event_billing::generate_billing_csv::generate_billing_csv;
 
 #[put("/api/events/<entity_id>", format = "json", data = "<update_event_data>")]
 pub fn update_event(

src/modules/api/personnel_billing/calculation.rs

@@ -1,4 +1,3 @@
-use bigdecimal::BigDecimal;
 use chrono::Utc;
 
 pub fn calculate_hours(real_start_time: chrono::DateTime<Utc>, real_end_time: chrono::DateTime<Utc>) -> Option<i32> {

src/modules/api/personnel_billing/create.rs

@@ -3,11 +3,11 @@ use rocket::serde::json::Json;
 use rocket::State;
 
 use crate::database::controller::billing::personnel_billing::RawPersonnelBilling;
-use crate::database::controller::billing::personnel_billing_rates::{get_billing_rate, get_billing_rates};
-use crate::database::controller::events::{get_position_instance, get_position_instances};
+use crate::database::controller::billing::personnel_billing_rates::get_billing_rate;
+use crate::database::controller::events::get_position_instance;
 use crate::helper::session_cookies::model::SessionCookie;
 use crate::helper::translate_diesel_error::translate_diesel;
-use crate::modules::api::member_management::controller::parser::{parse_member_cookie, parse_uuid_string};
+use crate::modules::api::member_management::controller::parser::parse_member_cookie;
 use crate::modules::api::model::api_outcome::{ApiError, ApiErrorWrapper};
 use crate::modules::api::personnel_billing::calculation::calculate_hours;
 use crate::Settings;

src/modules/api/personnel_billing/read.rs

@@ -3,7 +3,6 @@ use rocket::State;
 
 use crate::helper::session_cookies::model::SessionCookie;
 use crate::helper::translate_diesel_error::translate_diesel;
-use crate::modules::api::events::instances::read::{EventUnitInstance, PositionInstance};
 use crate::modules::api::member_management::controller::parser::{parse_member_cookie, parse_uuid_string};
 use crate::modules::api::model::api_outcome::{ApiError, ApiErrorWrapper};
 use crate::Settings;

src/modules/event_billing/approve.rs

@@ -4,11 +4,9 @@ use rocket_dyn_templates::Template;
 
 use crate::database::controller::events::get_event;
 use crate::database::controller::members::check_access_to_resource;
-use crate::database::model::events::Event;
 use crate::helper::session_cookies::model::SessionCookie;
 use crate::helper::sitebuilder::model::general::{Footer, Header, Script, Stylesheet};
 use crate::helper::sitebuilder::model::sidebar::Sidebar;
-use crate::modules::api::member_management::controller::parser::parse_uuid_string;
 use crate::modules::event_billing::event::EventBilling;
 use crate::Settings;
 

src/modules/event_billing/close_event.rs

@@ -3,7 +3,6 @@ use rocket::State;
 use rocket_dyn_templates::Template;
 
 use crate::database::controller::events::get_event;
-use crate::database::model::events::Event;
 use crate::helper::session_cookies::model::SessionCookie;
 use crate::helper::sitebuilder::model::general::{Footer, Header, Script, Stylesheet};
 use crate::helper::sitebuilder::model::sidebar::Sidebar;

src/modules/event_billing/edit_personnel_billing.rs

@@ -3,7 +3,6 @@ use rocket::State;
 use rocket_dyn_templates::Template;
 
 use crate::database::controller::events::get_event;
-use crate::database::model::events::Event;
 use crate::helper::session_cookies::model::SessionCookie;
 use crate::helper::sitebuilder::model::general::{Footer, Header, Script, Stylesheet};
 use crate::helper::sitebuilder::model::sidebar::Sidebar;

src/modules/event_billing/edit_times.rs

@@ -3,7 +3,6 @@ use rocket::State;
 use rocket_dyn_templates::Template;
 
 use crate::database::controller::events::get_event;
-use crate::database::model::events::Event;
 use crate::helper::session_cookies::model::SessionCookie;
 use crate::helper::sitebuilder::model::general::{Footer, Header, Script, Stylesheet};
 use crate::helper::sitebuilder::model::sidebar::Sidebar;

src/modules/event_billing/generate_billing_csv.rs

@@ -1,17 +1,16 @@
 use std::fmt;
 use std::fs::File;
 use std::io::Write;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use rocket::State;
 
 use crate::database::controller::billing::personnel_billing_rates::get_billing_rate;
-use crate::database::controller::events::{get_event, get_position_instance, get_position_instances};
+use crate::database::controller::events::{get_event, get_position_instances};
 use crate::database::controller::events::instances::instances::get_instances;
 use crate::database::controller::groups::get_group;
 use crate::database::controller::members::get_member_by_uuid;
 use crate::helper::time::utc_to_local_user_time;
-use crate::modules::api::personnel_billing::read::get_personnel_billing;
 use crate::Settings;
 
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]

src/modules/event_management/eventlist.rs

@@ -1,14 +1,14 @@
-use crate::helper::session_cookies::model::SessionCookie;
-use crate::helper::settings::Settings;
 use rocket::http::Status;
 use rocket::State;
-
-use crate::helper::sitebuilder::model::general::{Header, Footer, Stylesheet, Script};
-use crate::helper::sitebuilder::model::sidebar::Sidebar;
-use crate::database::model::groups::RawGroup;
-use crate::database::controller::groups::get_raw_groups;
 use rocket_dyn_templates::Template;
 
+use crate::database::controller::groups::get_raw_groups;
+use crate::database::model::groups::RawGroup;
+use crate::helper::session_cookies::model::SessionCookie;
+use crate::helper::settings::Settings;
+use crate::helper::sitebuilder::model::general::{Footer, Header, Script, Stylesheet};
+use crate::helper::sitebuilder::model::sidebar::Sidebar;
+
 #[derive(Serialize)]
 pub struct EventTemplates {
     pub header: Header,
@@ -59,7 +59,7 @@ pub fn eventlist(cookie: SessionCookie, settings: &State<Settings>) -> Result<Te
 
     let groups = match get_raw_groups(settings){
         Ok(groups) => groups,
-        Err(e) => return Err(Status::InternalServerError)
+        Err(_e) => return Err(Status::InternalServerError)
     };
 
     let eventlist = EventList {

src/modules/event_management/requests.rs

@@ -1,11 +1,12 @@
-use crate::helper::session_cookies::model::SessionCookie;
-use rocket::State;
-use crate::helper::settings::Settings;
-use rocket_dyn_templates::Template;
 use rocket::http::Status;
-use crate::helper::sitebuilder::model::general::{Header, Stylesheet, Footer, Script};
-use crate::helper::sitebuilder::model::sidebar::Sidebar;
+use rocket::State;
+use rocket_dyn_templates::Template;
+
 use crate::database::controller::groups::get_raw_groups;
+use crate::helper::session_cookies::model::SessionCookie;
+use crate::helper::settings::Settings;
+use crate::helper::sitebuilder::model::general::{Footer, Header, Script, Stylesheet};
+use crate::helper::sitebuilder::model::sidebar::Sidebar;
 use crate::modules::event_management::eventlist::EventList;
 
 #[get("/portal/em/requests")]
@@ -44,7 +45,7 @@ pub fn request_list(cookie: SessionCookie, settings: &State<Settings>) -> Result
 
     let groups = match get_raw_groups(settings){
         Ok(groups) => groups,
-        Err(e) => return Err(Status::InternalServerError)
+        Err(_e) => return Err(Status::InternalServerError)
     };
 
     let eventlist = EventList {

src/schema.rs

@@ -1,6 +1,6 @@
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     addresses (id) {
         id -> Uuid,
@@ -15,7 +15,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     addresses_entities (address_id, entitiy_id) {
         address_id -> Uuid,
@@ -25,7 +25,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     appointment_types (type_id) {
         type_id -> Uuid,
@@ -37,7 +37,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     appointments (id) {
         id -> Uuid,
@@ -49,7 +49,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     billing_states (entity_id) {
         name -> Text,
@@ -62,7 +62,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     buildings (entity_id) {
         entity_id -> Uuid,
@@ -73,7 +73,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     communication_targets (target_id) {
         target_id -> Uuid,
@@ -86,7 +86,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     communication_types (type_id) {
         type_id -> Uuid,
@@ -96,7 +96,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     cost_centres (short_id) {
         short_id -> Int4,
@@ -106,7 +106,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     cost_centres_members (member_entity_id, cost_centre_shortid) {
         member_entity_id -> Uuid,
@@ -116,7 +116,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     entities (entity_id) {
         entity_id -> Uuid,
@@ -125,7 +125,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     eu_instances (instance_id) {
         instance_id -> Uuid,
@@ -144,7 +144,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     eu_position_instances (position_instance_id) {
         instance_id -> Uuid,
@@ -159,7 +159,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     eu_positions (entity_id) {
         entity_id -> Uuid,
@@ -171,7 +171,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     eu_positions_templates (position_template_id) {
         position_entity_id -> Uuid,
@@ -184,7 +184,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     eu_templates (entity_id) {
         entity_id -> Uuid,
@@ -195,7 +195,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     eu_vehicle_positions (entity_id) {
         entity_id -> Uuid,
@@ -208,7 +208,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     event_organisers (entity_id) {
         entity_id -> Uuid,
@@ -223,7 +223,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     event_requests (entity_id) {
         entity_id -> Uuid,
@@ -246,7 +246,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     event_types (type_id) {
         type_id -> Uuid,
@@ -258,7 +258,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     events (entity_id) {
         entity_id -> Uuid,
@@ -281,7 +281,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     group_entity_state (state_id) {
         state_id -> Uuid,
@@ -293,7 +293,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     groups (entity_id) {
         entity_id -> Uuid,
@@ -304,7 +304,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     groups_entities (group_id, entity_id) {
         group_id -> Uuid,
@@ -315,7 +315,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     license_categories (name) {
         name -> Text,
@@ -325,7 +325,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     licenses_members (member_id, license_name) {
         member_id -> Uuid,
@@ -336,7 +336,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     login_attempts (id) {
         id -> Uuid,
@@ -347,7 +347,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     login_attempts_usernames (id) {
         id -> Uuid,
@@ -358,7 +358,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     members (entity_id) {
         entity_id -> Uuid,
@@ -382,7 +382,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     members_roles (member_id, role_id) {
         member_id -> Uuid,
@@ -392,7 +392,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     notification_types (name) {
         name -> Text,
@@ -402,7 +402,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     password_resets (token) {
         token -> Text,
@@ -413,7 +413,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     permissions (permission) {
         permission -> Text,
@@ -425,7 +425,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     personnel_billing (position_instance_id) {
         position_instance_id -> Uuid,
@@ -439,7 +439,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     personnel_billing_rates (billing_rate_id) {
         billing_rate_id -> Uuid,
@@ -453,7 +453,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     qualification_categories (id) {
         id -> Uuid,
@@ -464,7 +464,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     qualifications (id) {
         id -> Uuid,
@@ -476,7 +476,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     qualifications_members (member_id, qualification_id) {
         member_id -> Uuid,
@@ -486,7 +486,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     roles (id) {
         id -> Text,
@@ -496,7 +496,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     roles_permissions (role_permission_id) {
         role_id -> Text,
@@ -507,7 +507,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     roles_permissions_context (role_permission_id, entity) {
         role_permission_id -> Uuid,
@@ -517,7 +517,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     units (unit_id) {
         unit_id -> Uuid,
@@ -527,7 +527,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     units_members (unit_id, member_id) {
         unit_id -> Uuid,
@@ -538,7 +538,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     users (id) {
         id -> Uuid,
@@ -551,7 +551,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     vehicle_categories (id) {
         id -> Uuid,
@@ -562,7 +562,7 @@ table! {
 
 table! {
     use diesel::sql_types::*;
-    use diesel_geometry::sql_types::*;
+    
 
     vehicles (entity_id) {
         entity_id -> Uuid,