From 41587c3694fb601e846fd973261037cebcfb4355 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Mon, 24 Nov 2025 18:08:24 +0000 Subject: [PATCH] Move database logic into separate subdirectory I'm trying to see if this speeds up builds a bit. May not without a module boundary, but for now it's nice organization to have as the program grows. --- .gitmodules | 2 +- arcgis.go | 102 +++++++++++++----- auth.go | 13 +-- bob => db/bob | 0 bobgen.yaml => db/bobgen.yaml | 0 database.go => db/connection.go | 57 +--------- {dberrors => db/dberrors}/bob_errors.bob.go | 0 .../dberrors}/bob_main.bob_test.go | 0 .../dberrors}/fieldseeker_sync.bob.go | 0 .../dberrors}/fs_containerrelate.bob.go | 0 .../dberrors}/fs_fieldscoutinglog.bob.go | 0 .../dberrors}/fs_habitatrelate.bob.go | 0 .../dberrors}/fs_inspectionsample.bob.go | 0 .../fs_inspectionsampledetail.bob.go | 0 .../dberrors}/fs_linelocation.bob.go | 0 .../dberrors}/fs_locationtracking.bob.go | 0 .../dberrors}/fs_mosquitoinspection.bob.go | 0 .../dberrors}/fs_pointlocation.bob.go | 0 .../dberrors}/fs_polygonlocation.bob.go | 0 {dberrors => db/dberrors}/fs_pool.bob.go | 0 .../dberrors}/fs_pooldetail.bob.go | 0 .../dberrors}/fs_proposedtreatmentarea.bob.go | 0 .../dberrors}/fs_qamosquitoinspection.bob.go | 0 .../dberrors}/fs_rodentlocation.bob.go | 0 .../dberrors}/fs_samplecollection.bob.go | 0 .../dberrors}/fs_samplelocation.bob.go | 0 .../dberrors}/fs_servicerequest.bob.go | 0 .../dberrors}/fs_speciesabundance.bob.go | 0 .../dberrors}/fs_stormdrain.bob.go | 0 {dberrors => db/dberrors}/fs_timecard.bob.go | 0 {dberrors => db/dberrors}/fs_trapdata.bob.go | 0 .../dberrors}/fs_traplocation.bob.go | 0 {dberrors => db/dberrors}/fs_treatment.bob.go | 0 .../dberrors}/fs_treatmentarea.bob.go | 0 {dberrors => db/dberrors}/fs_zones.bob.go | 0 {dberrors => db/dberrors}/fs_zones2.bob.go | 0 .../dberrors}/goose_db_version.bob.go | 0 .../dberrors}/h3_aggregation.bob.go | 0 .../dberrors}/h3_aggregation.bob_test.go | 4 +- .../dberrors}/history_containerrelate.bob.go | 0 .../dberrors}/history_fieldscoutinglog.bob.go | 0 .../dberrors}/history_habitatrelate.bob.go | 0 .../dberrors}/history_inspectionsample.bob.go | 0 .../history_inspectionsampledetail.bob.go | 0 .../dberrors}/history_linelocation.bob.go | 0 .../dberrors}/history_locationtracking.bob.go | 0 .../history_mosquitoinspection.bob.go | 0 .../dberrors}/history_pointlocation.bob.go | 0 .../dberrors}/history_polygonlocation.bob.go | 0 {dberrors => db/dberrors}/history_pool.bob.go | 0 .../dberrors}/history_pooldetail.bob.go | 0 .../history_proposedtreatmentarea.bob.go | 0 .../history_qamosquitoinspection.bob.go | 0 .../dberrors}/history_rodentlocation.bob.go | 0 .../dberrors}/history_samplecollection.bob.go | 0 .../dberrors}/history_samplelocation.bob.go | 0 .../dberrors}/history_servicerequest.bob.go | 0 .../dberrors}/history_speciesabundance.bob.go | 0 .../dberrors}/history_stormdrain.bob.go | 0 .../dberrors}/history_timecard.bob.go | 0 .../dberrors}/history_trapdata.bob.go | 0 .../dberrors}/history_traplocation.bob.go | 0 .../dberrors}/history_treatment.bob.go | 0 .../dberrors}/history_treatmentarea.bob.go | 0 .../dberrors}/history_zones.bob.go | 0 .../dberrors}/history_zones2.bob.go | 0 {dberrors => db/dberrors}/notification.bob.go | 0 {dberrors => db/dberrors}/oauth_token.bob.go | 0 {dberrors => db/dberrors}/organization.bob.go | 0 {dberrors => db/dberrors}/sessions.bob.go | 0 .../dberrors}/spatial_ref_sys.bob.go | 0 {dberrors => db/dberrors}/user_.bob.go | 0 {dbinfo => db/dbinfo}/bob_types.bob.go | 0 {dbinfo => db/dbinfo}/fieldseeker_sync.bob.go | 0 .../dbinfo}/fs_containerrelate.bob.go | 0 .../dbinfo}/fs_fieldscoutinglog.bob.go | 0 {dbinfo => db/dbinfo}/fs_habitatrelate.bob.go | 0 .../dbinfo}/fs_inspectionsample.bob.go | 0 .../dbinfo}/fs_inspectionsampledetail.bob.go | 0 {dbinfo => db/dbinfo}/fs_linelocation.bob.go | 0 .../dbinfo}/fs_locationtracking.bob.go | 0 .../dbinfo}/fs_mosquitoinspection.bob.go | 0 {dbinfo => db/dbinfo}/fs_pointlocation.bob.go | 0 .../dbinfo}/fs_polygonlocation.bob.go | 0 {dbinfo => db/dbinfo}/fs_pool.bob.go | 0 {dbinfo => db/dbinfo}/fs_pooldetail.bob.go | 0 .../dbinfo}/fs_proposedtreatmentarea.bob.go | 0 .../dbinfo}/fs_qamosquitoinspection.bob.go | 0 .../dbinfo}/fs_rodentlocation.bob.go | 0 .../dbinfo}/fs_samplecollection.bob.go | 0 .../dbinfo}/fs_samplelocation.bob.go | 0 .../dbinfo}/fs_servicerequest.bob.go | 0 .../dbinfo}/fs_speciesabundance.bob.go | 0 {dbinfo => db/dbinfo}/fs_stormdrain.bob.go | 0 {dbinfo => db/dbinfo}/fs_timecard.bob.go | 0 {dbinfo => db/dbinfo}/fs_trapdata.bob.go | 0 {dbinfo => db/dbinfo}/fs_traplocation.bob.go | 0 {dbinfo => db/dbinfo}/fs_treatment.bob.go | 0 {dbinfo => db/dbinfo}/fs_treatmentarea.bob.go | 0 {dbinfo => db/dbinfo}/fs_zones.bob.go | 0 {dbinfo => db/dbinfo}/fs_zones2.bob.go | 0 .../dbinfo}/geography_columns.bob.go | 0 {dbinfo => db/dbinfo}/geometry_columns.bob.go | 0 {dbinfo => db/dbinfo}/goose_db_version.bob.go | 0 {dbinfo => db/dbinfo}/h3_aggregation.bob.go | 0 .../dbinfo}/history_containerrelate.bob.go | 0 .../dbinfo}/history_fieldscoutinglog.bob.go | 0 .../dbinfo}/history_habitatrelate.bob.go | 0 .../dbinfo}/history_inspectionsample.bob.go | 0 .../history_inspectionsampledetail.bob.go | 0 .../dbinfo}/history_linelocation.bob.go | 0 .../dbinfo}/history_locationtracking.bob.go | 0 .../dbinfo}/history_mosquitoinspection.bob.go | 0 .../dbinfo}/history_pointlocation.bob.go | 0 .../dbinfo}/history_polygonlocation.bob.go | 0 {dbinfo => db/dbinfo}/history_pool.bob.go | 0 .../dbinfo}/history_pooldetail.bob.go | 0 .../history_proposedtreatmentarea.bob.go | 0 .../history_qamosquitoinspection.bob.go | 0 .../dbinfo}/history_rodentlocation.bob.go | 0 .../dbinfo}/history_samplecollection.bob.go | 0 .../dbinfo}/history_samplelocation.bob.go | 0 .../dbinfo}/history_servicerequest.bob.go | 0 .../dbinfo}/history_speciesabundance.bob.go | 0 .../dbinfo}/history_stormdrain.bob.go | 0 {dbinfo => db/dbinfo}/history_timecard.bob.go | 0 {dbinfo => db/dbinfo}/history_trapdata.bob.go | 0 .../dbinfo}/history_traplocation.bob.go | 0 .../dbinfo}/history_treatment.bob.go | 0 .../dbinfo}/history_treatmentarea.bob.go | 0 {dbinfo => db/dbinfo}/history_zones.bob.go | 0 {dbinfo => db/dbinfo}/history_zones2.bob.go | 0 {dbinfo => db/dbinfo}/notification.bob.go | 0 {dbinfo => db/dbinfo}/oauth_token.bob.go | 0 {dbinfo => db/dbinfo}/organization.bob.go | 0 {dbinfo => db/dbinfo}/raster_columns.bob.go | 0 {dbinfo => db/dbinfo}/raster_overviews.bob.go | 0 {dbinfo => db/dbinfo}/sessions.bob.go | 0 {dbinfo => db/dbinfo}/spatial_ref_sys.bob.go | 0 {dbinfo => db/dbinfo}/user_.bob.go | 0 {enums => db/enums}/enums.bob.go | 0 .../factory}/bobfactory_context.bob.go | 0 .../factory}/bobfactory_main.bob.go | 4 +- .../factory}/bobfactory_main.bob_test.go | 0 .../factory}/bobfactory_random.bob.go | 2 +- .../factory}/bobfactory_random.bob_test.go | 0 .../factory}/fieldseeker_sync.bob.go | 2 +- .../factory}/fs_containerrelate.bob.go | 2 +- .../factory}/fs_fieldscoutinglog.bob.go | 2 +- .../factory}/fs_habitatrelate.bob.go | 2 +- .../factory}/fs_inspectionsample.bob.go | 2 +- .../factory}/fs_inspectionsampledetail.bob.go | 2 +- .../factory}/fs_linelocation.bob.go | 2 +- .../factory}/fs_locationtracking.bob.go | 2 +- .../factory}/fs_mosquitoinspection.bob.go | 2 +- .../factory}/fs_pointlocation.bob.go | 2 +- .../factory}/fs_polygonlocation.bob.go | 2 +- {factory => db/factory}/fs_pool.bob.go | 2 +- {factory => db/factory}/fs_pooldetail.bob.go | 2 +- .../factory}/fs_proposedtreatmentarea.bob.go | 2 +- .../factory}/fs_qamosquitoinspection.bob.go | 2 +- .../factory}/fs_rodentlocation.bob.go | 2 +- .../factory}/fs_samplecollection.bob.go | 2 +- .../factory}/fs_samplelocation.bob.go | 2 +- .../factory}/fs_servicerequest.bob.go | 2 +- .../factory}/fs_speciesabundance.bob.go | 2 +- {factory => db/factory}/fs_stormdrain.bob.go | 2 +- {factory => db/factory}/fs_timecard.bob.go | 2 +- {factory => db/factory}/fs_trapdata.bob.go | 2 +- .../factory}/fs_traplocation.bob.go | 2 +- {factory => db/factory}/fs_treatment.bob.go | 2 +- .../factory}/fs_treatmentarea.bob.go | 2 +- {factory => db/factory}/fs_zones.bob.go | 2 +- {factory => db/factory}/fs_zones2.bob.go | 2 +- .../factory}/geography_columns.bob.go | 2 +- .../factory}/geometry_columns.bob.go | 2 +- .../factory}/goose_db_version.bob.go | 2 +- {factory => db/factory}/h3_aggregation.bob.go | 4 +- .../factory}/history_containerrelate.bob.go | 2 +- .../factory}/history_fieldscoutinglog.bob.go | 2 +- .../factory}/history_habitatrelate.bob.go | 2 +- .../factory}/history_inspectionsample.bob.go | 2 +- .../history_inspectionsampledetail.bob.go | 2 +- .../factory}/history_linelocation.bob.go | 2 +- .../factory}/history_locationtracking.bob.go | 2 +- .../history_mosquitoinspection.bob.go | 2 +- .../factory}/history_pointlocation.bob.go | 2 +- .../factory}/history_polygonlocation.bob.go | 2 +- {factory => db/factory}/history_pool.bob.go | 2 +- .../factory}/history_pooldetail.bob.go | 2 +- .../history_proposedtreatmentarea.bob.go | 2 +- .../history_qamosquitoinspection.bob.go | 2 +- .../factory}/history_rodentlocation.bob.go | 2 +- .../factory}/history_samplecollection.bob.go | 2 +- .../factory}/history_samplelocation.bob.go | 2 +- .../factory}/history_servicerequest.bob.go | 2 +- .../factory}/history_speciesabundance.bob.go | 2 +- .../factory}/history_stormdrain.bob.go | 2 +- .../factory}/history_timecard.bob.go | 2 +- .../factory}/history_trapdata.bob.go | 2 +- .../factory}/history_traplocation.bob.go | 2 +- .../factory}/history_treatment.bob.go | 2 +- .../factory}/history_treatmentarea.bob.go | 2 +- {factory => db/factory}/history_zones.bob.go | 2 +- {factory => db/factory}/history_zones2.bob.go | 2 +- {factory => db/factory}/notification.bob.go | 4 +- {factory => db/factory}/oauth_token.bob.go | 2 +- {factory => db/factory}/organization.bob.go | 2 +- {factory => db/factory}/raster_columns.bob.go | 2 +- .../factory}/raster_overviews.bob.go | 2 +- {factory => db/factory}/sessions.bob.go | 2 +- .../factory}/spatial_ref_sys.bob.go | 2 +- {factory => db/factory}/user_.bob.go | 4 +- .../migrations}/00001_initial.sql | 0 .../migrations}/00002_password.sql | 0 .../migrations}/00003_add_session.sql | 0 .../migrations}/00004_add_oauth_token.sql | 0 .../migrations}/00005_add_arcgis_org.sql | 0 .../00006_add_oauth_refresh_expires.sql | 0 .../migrations}/00007_add_fieldseeker.sql | 0 .../migrations}/00008_add_sync.sql | 0 .../00009_add_oauth_invalidated.sql | 0 .../migrations}/00010_add_notification.sql | 0 .../migrations}/00011_fix_fieldseeker.sql | 0 .../00012_notification_unique_link.sql | 0 .../00013_fs_globalid_not_null.sql | 0 .../migrations}/00014_h3_aggregation.sql | 0 .../migrations}/00015_fs_geometry.sql | 0 {models => db/models}/bob_joins.bob.go | 0 {models => db/models}/bob_loaders.bob.go | 0 {models => db/models}/bob_types.bob_test.go | 2 +- {models => db/models}/bob_where.bob.go | 0 {models => db/models}/fieldseeker_sync.bob.go | 0 .../models}/fs_containerrelate.bob.go | 0 .../models}/fs_fieldscoutinglog.bob.go | 0 {models => db/models}/fs_habitatrelate.bob.go | 0 .../models}/fs_inspectionsample.bob.go | 0 .../models}/fs_inspectionsampledetail.bob.go | 0 {models => db/models}/fs_linelocation.bob.go | 0 .../models}/fs_locationtracking.bob.go | 0 .../models}/fs_mosquitoinspection.bob.go | 0 {models => db/models}/fs_pointlocation.bob.go | 0 .../models}/fs_polygonlocation.bob.go | 0 {models => db/models}/fs_pool.bob.go | 0 {models => db/models}/fs_pooldetail.bob.go | 0 .../models}/fs_proposedtreatmentarea.bob.go | 0 .../models}/fs_qamosquitoinspection.bob.go | 0 .../models}/fs_rodentlocation.bob.go | 0 .../models}/fs_samplecollection.bob.go | 0 .../models}/fs_samplelocation.bob.go | 0 .../models}/fs_servicerequest.bob.go | 0 .../models}/fs_speciesabundance.bob.go | 0 {models => db/models}/fs_stormdrain.bob.go | 0 {models => db/models}/fs_timecard.bob.go | 0 {models => db/models}/fs_trapdata.bob.go | 0 {models => db/models}/fs_traplocation.bob.go | 0 {models => db/models}/fs_treatment.bob.go | 0 {models => db/models}/fs_treatmentarea.bob.go | 0 {models => db/models}/fs_zones.bob.go | 0 {models => db/models}/fs_zones2.bob.go | 0 .../models}/geography_columns.bob.go | 0 {models => db/models}/geometry_columns.bob.go | 0 {models => db/models}/goose_db_version.bob.go | 0 {models => db/models}/h3_aggregation.bob.go | 2 +- .../models}/history_containerrelate.bob.go | 0 .../models}/history_fieldscoutinglog.bob.go | 0 .../models}/history_habitatrelate.bob.go | 0 .../models}/history_inspectionsample.bob.go | 0 .../history_inspectionsampledetail.bob.go | 0 .../models}/history_linelocation.bob.go | 0 .../models}/history_locationtracking.bob.go | 0 .../models}/history_mosquitoinspection.bob.go | 0 .../models}/history_pointlocation.bob.go | 0 .../models}/history_polygonlocation.bob.go | 0 {models => db/models}/history_pool.bob.go | 0 .../models}/history_pooldetail.bob.go | 0 .../history_proposedtreatmentarea.bob.go | 0 .../history_qamosquitoinspection.bob.go | 0 .../models}/history_rodentlocation.bob.go | 0 .../models}/history_samplecollection.bob.go | 0 .../models}/history_samplelocation.bob.go | 0 .../models}/history_servicerequest.bob.go | 0 .../models}/history_speciesabundance.bob.go | 0 .../models}/history_stormdrain.bob.go | 0 {models => db/models}/history_timecard.bob.go | 0 {models => db/models}/history_trapdata.bob.go | 0 .../models}/history_traplocation.bob.go | 0 .../models}/history_treatment.bob.go | 0 .../models}/history_treatmentarea.bob.go | 0 {models => db/models}/history_zones.bob.go | 0 {models => db/models}/history_zones2.bob.go | 0 {models => db/models}/notification.bob.go | 2 +- {models => db/models}/oauth_token.bob.go | 0 {models => db/models}/organization.bob.go | 0 {models => db/models}/raster_columns.bob.go | 0 {models => db/models}/raster_overviews.bob.go | 0 {models => db/models}/sessions.bob.go | 0 {models => db/models}/spatial_ref_sys.bob.go | 0 {models => db/models}/user_.bob.go | 2 +- {sql => db/sql}/oauth_by_user_id.bob.go | 0 {sql => db/sql}/oauth_by_user_id.bob.sql | 0 {sql => db/sql}/oauth_by_user_id.bob_test.go | 0 {sql => db/sql}/oauth_by_user_id.sql | 0 {sql => db/sql}/org_by_oauth_id.bob.go | 0 {sql => db/sql}/org_by_oauth_id.bob.sql | 0 {sql => db/sql}/org_by_oauth_id.bob_test.go | 0 {sql => db/sql}/org_by_oauth_id.sql | 0 {sql => db/sql}/test_utils.bob_test.go | 2 +- .../sql}/trapcount_by_location_id.bob.go | 0 .../sql}/trapcount_by_location_id.bob.sql | 0 .../sql}/trapcount_by_location_id.bob_test.go | 0 {sql => db/sql}/trapcount_by_location_id.sql | 0 .../trapdata_by_location_id_recent.bob.go | 0 .../trapdata_by_location_id_recent.bob.sql | 0 ...trapdata_by_location_id_recent.bob_test.go | 0 .../sql}/trapdata_by_location_id_recent.sql | 0 .../sql}/traplocation_by_source_id.bob.go | 0 .../sql}/traplocation_by_source_id.bob.sql | 0 .../traplocation_by_source_id.bob_test.go | 0 {sql => db/sql}/traplocation_by_source_id.sql | 0 {sql => db/sql}/update_oauth_org.bob.go | 0 {sql => db/sql}/update_oauth_org.bob.sql | 0 {sql => db/sql}/update_oauth_org.bob_test.go | 0 {sql => db/sql}/update_oauth_org.sql | 0 {sql => db/sql}/user_by_username.bob.go | 2 +- {sql => db/sql}/user_by_username.bob.sql | 0 {sql => db/sql}/user_by_username.bob_test.go | 0 {sql => db/sql}/user_by_username.sql | 0 endpoint.go | 2 +- html.go | 48 +++++---- main.go | 5 +- model_conversion.go | 4 +- notification.go | 11 +- 333 files changed, 206 insertions(+), 200 deletions(-) rename bob => db/bob (100%) rename bobgen.yaml => db/bobgen.yaml (100%) rename database.go => db/connection.go (62%) rename {dberrors => db/dberrors}/bob_errors.bob.go (100%) rename {dberrors => db/dberrors}/bob_main.bob_test.go (100%) rename {dberrors => db/dberrors}/fieldseeker_sync.bob.go (100%) rename {dberrors => db/dberrors}/fs_containerrelate.bob.go (100%) rename {dberrors => db/dberrors}/fs_fieldscoutinglog.bob.go (100%) rename {dberrors => db/dberrors}/fs_habitatrelate.bob.go (100%) rename {dberrors => db/dberrors}/fs_inspectionsample.bob.go (100%) rename {dberrors => db/dberrors}/fs_inspectionsampledetail.bob.go (100%) rename {dberrors => db/dberrors}/fs_linelocation.bob.go (100%) rename {dberrors => db/dberrors}/fs_locationtracking.bob.go (100%) rename {dberrors => db/dberrors}/fs_mosquitoinspection.bob.go (100%) rename {dberrors => db/dberrors}/fs_pointlocation.bob.go (100%) rename {dberrors => db/dberrors}/fs_polygonlocation.bob.go (100%) rename {dberrors => db/dberrors}/fs_pool.bob.go (100%) rename {dberrors => db/dberrors}/fs_pooldetail.bob.go (100%) rename {dberrors => db/dberrors}/fs_proposedtreatmentarea.bob.go (100%) rename {dberrors => db/dberrors}/fs_qamosquitoinspection.bob.go (100%) rename {dberrors => db/dberrors}/fs_rodentlocation.bob.go (100%) rename {dberrors => db/dberrors}/fs_samplecollection.bob.go (100%) rename {dberrors => db/dberrors}/fs_samplelocation.bob.go (100%) rename {dberrors => db/dberrors}/fs_servicerequest.bob.go (100%) rename {dberrors => db/dberrors}/fs_speciesabundance.bob.go (100%) rename {dberrors => db/dberrors}/fs_stormdrain.bob.go (100%) rename {dberrors => db/dberrors}/fs_timecard.bob.go (100%) rename {dberrors => db/dberrors}/fs_trapdata.bob.go (100%) rename {dberrors => db/dberrors}/fs_traplocation.bob.go (100%) rename {dberrors => db/dberrors}/fs_treatment.bob.go (100%) rename {dberrors => db/dberrors}/fs_treatmentarea.bob.go (100%) rename {dberrors => db/dberrors}/fs_zones.bob.go (100%) rename {dberrors => db/dberrors}/fs_zones2.bob.go (100%) rename {dberrors => db/dberrors}/goose_db_version.bob.go (100%) rename {dberrors => db/dberrors}/h3_aggregation.bob.go (100%) rename {dberrors => db/dberrors}/h3_aggregation.bob_test.go (96%) rename {dberrors => db/dberrors}/history_containerrelate.bob.go (100%) rename {dberrors => db/dberrors}/history_fieldscoutinglog.bob.go (100%) rename {dberrors => db/dberrors}/history_habitatrelate.bob.go (100%) rename {dberrors => db/dberrors}/history_inspectionsample.bob.go (100%) rename {dberrors => db/dberrors}/history_inspectionsampledetail.bob.go (100%) rename {dberrors => db/dberrors}/history_linelocation.bob.go (100%) rename {dberrors => db/dberrors}/history_locationtracking.bob.go (100%) rename {dberrors => db/dberrors}/history_mosquitoinspection.bob.go (100%) rename {dberrors => db/dberrors}/history_pointlocation.bob.go (100%) rename {dberrors => db/dberrors}/history_polygonlocation.bob.go (100%) rename {dberrors => db/dberrors}/history_pool.bob.go (100%) rename {dberrors => db/dberrors}/history_pooldetail.bob.go (100%) rename {dberrors => db/dberrors}/history_proposedtreatmentarea.bob.go (100%) rename {dberrors => db/dberrors}/history_qamosquitoinspection.bob.go (100%) rename {dberrors => db/dberrors}/history_rodentlocation.bob.go (100%) rename {dberrors => db/dberrors}/history_samplecollection.bob.go (100%) rename {dberrors => db/dberrors}/history_samplelocation.bob.go (100%) rename {dberrors => db/dberrors}/history_servicerequest.bob.go (100%) rename {dberrors => db/dberrors}/history_speciesabundance.bob.go (100%) rename {dberrors => db/dberrors}/history_stormdrain.bob.go (100%) rename {dberrors => db/dberrors}/history_timecard.bob.go (100%) rename {dberrors => db/dberrors}/history_trapdata.bob.go (100%) rename {dberrors => db/dberrors}/history_traplocation.bob.go (100%) rename {dberrors => db/dberrors}/history_treatment.bob.go (100%) rename {dberrors => db/dberrors}/history_treatmentarea.bob.go (100%) rename {dberrors => db/dberrors}/history_zones.bob.go (100%) rename {dberrors => db/dberrors}/history_zones2.bob.go (100%) rename {dberrors => db/dberrors}/notification.bob.go (100%) rename {dberrors => db/dberrors}/oauth_token.bob.go (100%) rename {dberrors => db/dberrors}/organization.bob.go (100%) rename {dberrors => db/dberrors}/sessions.bob.go (100%) rename {dberrors => db/dberrors}/spatial_ref_sys.bob.go (100%) rename {dberrors => db/dberrors}/user_.bob.go (100%) rename {dbinfo => db/dbinfo}/bob_types.bob.go (100%) rename {dbinfo => db/dbinfo}/fieldseeker_sync.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_containerrelate.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_fieldscoutinglog.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_habitatrelate.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_inspectionsample.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_inspectionsampledetail.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_linelocation.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_locationtracking.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_mosquitoinspection.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_pointlocation.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_polygonlocation.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_pool.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_pooldetail.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_proposedtreatmentarea.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_qamosquitoinspection.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_rodentlocation.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_samplecollection.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_samplelocation.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_servicerequest.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_speciesabundance.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_stormdrain.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_timecard.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_trapdata.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_traplocation.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_treatment.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_treatmentarea.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_zones.bob.go (100%) rename {dbinfo => db/dbinfo}/fs_zones2.bob.go (100%) rename {dbinfo => db/dbinfo}/geography_columns.bob.go (100%) rename {dbinfo => db/dbinfo}/geometry_columns.bob.go (100%) rename {dbinfo => db/dbinfo}/goose_db_version.bob.go (100%) rename {dbinfo => db/dbinfo}/h3_aggregation.bob.go (100%) rename {dbinfo => db/dbinfo}/history_containerrelate.bob.go (100%) rename {dbinfo => db/dbinfo}/history_fieldscoutinglog.bob.go (100%) rename {dbinfo => db/dbinfo}/history_habitatrelate.bob.go (100%) rename {dbinfo => db/dbinfo}/history_inspectionsample.bob.go (100%) rename {dbinfo => db/dbinfo}/history_inspectionsampledetail.bob.go (100%) rename {dbinfo => db/dbinfo}/history_linelocation.bob.go (100%) rename {dbinfo => db/dbinfo}/history_locationtracking.bob.go (100%) rename {dbinfo => db/dbinfo}/history_mosquitoinspection.bob.go (100%) rename {dbinfo => db/dbinfo}/history_pointlocation.bob.go (100%) rename {dbinfo => db/dbinfo}/history_polygonlocation.bob.go (100%) rename {dbinfo => db/dbinfo}/history_pool.bob.go (100%) rename {dbinfo => db/dbinfo}/history_pooldetail.bob.go (100%) rename {dbinfo => db/dbinfo}/history_proposedtreatmentarea.bob.go (100%) rename {dbinfo => db/dbinfo}/history_qamosquitoinspection.bob.go (100%) rename {dbinfo => db/dbinfo}/history_rodentlocation.bob.go (100%) rename {dbinfo => db/dbinfo}/history_samplecollection.bob.go (100%) rename {dbinfo => db/dbinfo}/history_samplelocation.bob.go (100%) rename {dbinfo => db/dbinfo}/history_servicerequest.bob.go (100%) rename {dbinfo => db/dbinfo}/history_speciesabundance.bob.go (100%) rename {dbinfo => db/dbinfo}/history_stormdrain.bob.go (100%) rename {dbinfo => db/dbinfo}/history_timecard.bob.go (100%) rename {dbinfo => db/dbinfo}/history_trapdata.bob.go (100%) rename {dbinfo => db/dbinfo}/history_traplocation.bob.go (100%) rename {dbinfo => db/dbinfo}/history_treatment.bob.go (100%) rename {dbinfo => db/dbinfo}/history_treatmentarea.bob.go (100%) rename {dbinfo => db/dbinfo}/history_zones.bob.go (100%) rename {dbinfo => db/dbinfo}/history_zones2.bob.go (100%) rename {dbinfo => db/dbinfo}/notification.bob.go (100%) rename {dbinfo => db/dbinfo}/oauth_token.bob.go (100%) rename {dbinfo => db/dbinfo}/organization.bob.go (100%) rename {dbinfo => db/dbinfo}/raster_columns.bob.go (100%) rename {dbinfo => db/dbinfo}/raster_overviews.bob.go (100%) rename {dbinfo => db/dbinfo}/sessions.bob.go (100%) rename {dbinfo => db/dbinfo}/spatial_ref_sys.bob.go (100%) rename {dbinfo => db/dbinfo}/user_.bob.go (100%) rename {enums => db/enums}/enums.bob.go (100%) rename {factory => db/factory}/bobfactory_context.bob.go (100%) rename {factory => db/factory}/bobfactory_main.bob.go (99%) rename {factory => db/factory}/bobfactory_main.bob_test.go (100%) rename {factory => db/factory}/bobfactory_random.bob.go (98%) rename {factory => db/factory}/bobfactory_random.bob_test.go (100%) rename {factory => db/factory}/fieldseeker_sync.bob.go (99%) rename {factory => db/factory}/fs_containerrelate.bob.go (99%) rename {factory => db/factory}/fs_fieldscoutinglog.bob.go (99%) rename {factory => db/factory}/fs_habitatrelate.bob.go (99%) rename {factory => db/factory}/fs_inspectionsample.bob.go (99%) rename {factory => db/factory}/fs_inspectionsampledetail.bob.go (99%) rename {factory => db/factory}/fs_linelocation.bob.go (99%) rename {factory => db/factory}/fs_locationtracking.bob.go (99%) rename {factory => db/factory}/fs_mosquitoinspection.bob.go (99%) rename {factory => db/factory}/fs_pointlocation.bob.go (99%) rename {factory => db/factory}/fs_polygonlocation.bob.go (99%) rename {factory => db/factory}/fs_pool.bob.go (99%) rename {factory => db/factory}/fs_pooldetail.bob.go (99%) rename {factory => db/factory}/fs_proposedtreatmentarea.bob.go (99%) rename {factory => db/factory}/fs_qamosquitoinspection.bob.go (99%) rename {factory => db/factory}/fs_rodentlocation.bob.go (99%) rename {factory => db/factory}/fs_samplecollection.bob.go (99%) rename {factory => db/factory}/fs_samplelocation.bob.go (99%) rename {factory => db/factory}/fs_servicerequest.bob.go (99%) rename {factory => db/factory}/fs_speciesabundance.bob.go (99%) rename {factory => db/factory}/fs_stormdrain.bob.go (99%) rename {factory => db/factory}/fs_timecard.bob.go (99%) rename {factory => db/factory}/fs_trapdata.bob.go (99%) rename {factory => db/factory}/fs_traplocation.bob.go (99%) rename {factory => db/factory}/fs_treatment.bob.go (99%) rename {factory => db/factory}/fs_treatmentarea.bob.go (99%) rename {factory => db/factory}/fs_zones.bob.go (99%) rename {factory => db/factory}/fs_zones2.bob.go (99%) rename {factory => db/factory}/geography_columns.bob.go (99%) rename {factory => db/factory}/geometry_columns.bob.go (99%) rename {factory => db/factory}/goose_db_version.bob.go (99%) rename {factory => db/factory}/h3_aggregation.bob.go (99%) rename {factory => db/factory}/history_containerrelate.bob.go (99%) rename {factory => db/factory}/history_fieldscoutinglog.bob.go (99%) rename {factory => db/factory}/history_habitatrelate.bob.go (99%) rename {factory => db/factory}/history_inspectionsample.bob.go (99%) rename {factory => db/factory}/history_inspectionsampledetail.bob.go (99%) rename {factory => db/factory}/history_linelocation.bob.go (99%) rename {factory => db/factory}/history_locationtracking.bob.go (99%) rename {factory => db/factory}/history_mosquitoinspection.bob.go (99%) rename {factory => db/factory}/history_pointlocation.bob.go (99%) rename {factory => db/factory}/history_polygonlocation.bob.go (99%) rename {factory => db/factory}/history_pool.bob.go (99%) rename {factory => db/factory}/history_pooldetail.bob.go (99%) rename {factory => db/factory}/history_proposedtreatmentarea.bob.go (99%) rename {factory => db/factory}/history_qamosquitoinspection.bob.go (99%) rename {factory => db/factory}/history_rodentlocation.bob.go (99%) rename {factory => db/factory}/history_samplecollection.bob.go (99%) rename {factory => db/factory}/history_samplelocation.bob.go (99%) rename {factory => db/factory}/history_servicerequest.bob.go (99%) rename {factory => db/factory}/history_speciesabundance.bob.go (99%) rename {factory => db/factory}/history_stormdrain.bob.go (99%) rename {factory => db/factory}/history_timecard.bob.go (99%) rename {factory => db/factory}/history_trapdata.bob.go (99%) rename {factory => db/factory}/history_traplocation.bob.go (99%) rename {factory => db/factory}/history_treatment.bob.go (99%) rename {factory => db/factory}/history_treatmentarea.bob.go (99%) rename {factory => db/factory}/history_zones.bob.go (99%) rename {factory => db/factory}/history_zones2.bob.go (99%) rename {factory => db/factory}/notification.bob.go (99%) rename {factory => db/factory}/oauth_token.bob.go (99%) rename {factory => db/factory}/organization.bob.go (99%) rename {factory => db/factory}/raster_columns.bob.go (99%) rename {factory => db/factory}/raster_overviews.bob.go (99%) rename {factory => db/factory}/sessions.bob.go (99%) rename {factory => db/factory}/spatial_ref_sys.bob.go (99%) rename {factory => db/factory}/user_.bob.go (99%) rename {migrations => db/migrations}/00001_initial.sql (100%) rename {migrations => db/migrations}/00002_password.sql (100%) rename {migrations => db/migrations}/00003_add_session.sql (100%) rename {migrations => db/migrations}/00004_add_oauth_token.sql (100%) rename {migrations => db/migrations}/00005_add_arcgis_org.sql (100%) rename {migrations => db/migrations}/00006_add_oauth_refresh_expires.sql (100%) rename {migrations => db/migrations}/00007_add_fieldseeker.sql (100%) rename {migrations => db/migrations}/00008_add_sync.sql (100%) rename {migrations => db/migrations}/00009_add_oauth_invalidated.sql (100%) rename {migrations => db/migrations}/00010_add_notification.sql (100%) rename {migrations => db/migrations}/00011_fix_fieldseeker.sql (100%) rename {migrations => db/migrations}/00012_notification_unique_link.sql (100%) rename {migrations => db/migrations}/00013_fs_globalid_not_null.sql (100%) rename {migrations => db/migrations}/00014_h3_aggregation.sql (100%) rename {migrations => db/migrations}/00015_fs_geometry.sql (100%) rename {models => db/models}/bob_joins.bob.go (100%) rename {models => db/models}/bob_loaders.bob.go (100%) rename {models => db/models}/bob_types.bob_test.go (99%) rename {models => db/models}/bob_where.bob.go (100%) rename {models => db/models}/fieldseeker_sync.bob.go (100%) rename {models => db/models}/fs_containerrelate.bob.go (100%) rename {models => db/models}/fs_fieldscoutinglog.bob.go (100%) rename {models => db/models}/fs_habitatrelate.bob.go (100%) rename {models => db/models}/fs_inspectionsample.bob.go (100%) rename {models => db/models}/fs_inspectionsampledetail.bob.go (100%) rename {models => db/models}/fs_linelocation.bob.go (100%) rename {models => db/models}/fs_locationtracking.bob.go (100%) rename {models => db/models}/fs_mosquitoinspection.bob.go (100%) rename {models => db/models}/fs_pointlocation.bob.go (100%) rename {models => db/models}/fs_polygonlocation.bob.go (100%) rename {models => db/models}/fs_pool.bob.go (100%) rename {models => db/models}/fs_pooldetail.bob.go (100%) rename {models => db/models}/fs_proposedtreatmentarea.bob.go (100%) rename {models => db/models}/fs_qamosquitoinspection.bob.go (100%) rename {models => db/models}/fs_rodentlocation.bob.go (100%) rename {models => db/models}/fs_samplecollection.bob.go (100%) rename {models => db/models}/fs_samplelocation.bob.go (100%) rename {models => db/models}/fs_servicerequest.bob.go (100%) rename {models => db/models}/fs_speciesabundance.bob.go (100%) rename {models => db/models}/fs_stormdrain.bob.go (100%) rename {models => db/models}/fs_timecard.bob.go (100%) rename {models => db/models}/fs_trapdata.bob.go (100%) rename {models => db/models}/fs_traplocation.bob.go (100%) rename {models => db/models}/fs_treatment.bob.go (100%) rename {models => db/models}/fs_treatmentarea.bob.go (100%) rename {models => db/models}/fs_zones.bob.go (100%) rename {models => db/models}/fs_zones2.bob.go (100%) rename {models => db/models}/geography_columns.bob.go (100%) rename {models => db/models}/geometry_columns.bob.go (100%) rename {models => db/models}/goose_db_version.bob.go (100%) rename {models => db/models}/h3_aggregation.bob.go (99%) rename {models => db/models}/history_containerrelate.bob.go (100%) rename {models => db/models}/history_fieldscoutinglog.bob.go (100%) rename {models => db/models}/history_habitatrelate.bob.go (100%) rename {models => db/models}/history_inspectionsample.bob.go (100%) rename {models => db/models}/history_inspectionsampledetail.bob.go (100%) rename {models => db/models}/history_linelocation.bob.go (100%) rename {models => db/models}/history_locationtracking.bob.go (100%) rename {models => db/models}/history_mosquitoinspection.bob.go (100%) rename {models => db/models}/history_pointlocation.bob.go (100%) rename {models => db/models}/history_polygonlocation.bob.go (100%) rename {models => db/models}/history_pool.bob.go (100%) rename {models => db/models}/history_pooldetail.bob.go (100%) rename {models => db/models}/history_proposedtreatmentarea.bob.go (100%) rename {models => db/models}/history_qamosquitoinspection.bob.go (100%) rename {models => db/models}/history_rodentlocation.bob.go (100%) rename {models => db/models}/history_samplecollection.bob.go (100%) rename {models => db/models}/history_samplelocation.bob.go (100%) rename {models => db/models}/history_servicerequest.bob.go (100%) rename {models => db/models}/history_speciesabundance.bob.go (100%) rename {models => db/models}/history_stormdrain.bob.go (100%) rename {models => db/models}/history_timecard.bob.go (100%) rename {models => db/models}/history_trapdata.bob.go (100%) rename {models => db/models}/history_traplocation.bob.go (100%) rename {models => db/models}/history_treatment.bob.go (100%) rename {models => db/models}/history_treatmentarea.bob.go (100%) rename {models => db/models}/history_zones.bob.go (100%) rename {models => db/models}/history_zones2.bob.go (100%) rename {models => db/models}/notification.bob.go (99%) rename {models => db/models}/oauth_token.bob.go (100%) rename {models => db/models}/organization.bob.go (100%) rename {models => db/models}/raster_columns.bob.go (100%) rename {models => db/models}/raster_overviews.bob.go (100%) rename {models => db/models}/sessions.bob.go (100%) rename {models => db/models}/spatial_ref_sys.bob.go (100%) rename {models => db/models}/user_.bob.go (99%) rename {sql => db/sql}/oauth_by_user_id.bob.go (100%) rename {sql => db/sql}/oauth_by_user_id.bob.sql (100%) rename {sql => db/sql}/oauth_by_user_id.bob_test.go (100%) rename {sql => db/sql}/oauth_by_user_id.sql (100%) rename {sql => db/sql}/org_by_oauth_id.bob.go (100%) rename {sql => db/sql}/org_by_oauth_id.bob.sql (100%) rename {sql => db/sql}/org_by_oauth_id.bob_test.go (100%) rename {sql => db/sql}/org_by_oauth_id.sql (100%) rename {sql => db/sql}/test_utils.bob_test.go (97%) rename {sql => db/sql}/trapcount_by_location_id.bob.go (100%) rename {sql => db/sql}/trapcount_by_location_id.bob.sql (100%) rename {sql => db/sql}/trapcount_by_location_id.bob_test.go (100%) rename {sql => db/sql}/trapcount_by_location_id.sql (100%) rename {sql => db/sql}/trapdata_by_location_id_recent.bob.go (100%) rename {sql => db/sql}/trapdata_by_location_id_recent.bob.sql (100%) rename {sql => db/sql}/trapdata_by_location_id_recent.bob_test.go (100%) rename {sql => db/sql}/trapdata_by_location_id_recent.sql (100%) rename {sql => db/sql}/traplocation_by_source_id.bob.go (100%) rename {sql => db/sql}/traplocation_by_source_id.bob.sql (100%) rename {sql => db/sql}/traplocation_by_source_id.bob_test.go (100%) rename {sql => db/sql}/traplocation_by_source_id.sql (100%) rename {sql => db/sql}/update_oauth_org.bob.go (100%) rename {sql => db/sql}/update_oauth_org.bob.sql (100%) rename {sql => db/sql}/update_oauth_org.bob_test.go (100%) rename {sql => db/sql}/update_oauth_org.sql (100%) rename {sql => db/sql}/user_by_username.bob.go (98%) rename {sql => db/sql}/user_by_username.bob.sql (100%) rename {sql => db/sql}/user_by_username.bob_test.go (100%) rename {sql => db/sql}/user_by_username.sql (100%) diff --git a/.gitmodules b/.gitmodules index a95655f1..555f12c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,5 @@ path = go-geojson2h3 url = git@github.com:Gleipnir-Technology/go-geojson2h3.git [submodule "bob"] - path = bob + path = db/bob url = git@github.com:Gleipnir-Technology/bob.git diff --git a/arcgis.go b/arcgis.go index 83e258cf..475d9de7 100644 --- a/arcgis.go +++ b/arcgis.go @@ -21,13 +21,20 @@ import ( "github.com/Gleipnir-Technology/arcgis-go" "github.com/Gleipnir-Technology/arcgis-go/fieldseeker" - "github.com/Gleipnir-Technology/nidus-sync/models" - "github.com/Gleipnir-Technology/nidus-sync/sql" + "github.com/Gleipnir-Technology/nidus-sync/db" + "github.com/Gleipnir-Technology/nidus-sync/db/enums" + "github.com/Gleipnir-Technology/nidus-sync/db/models" + "github.com/Gleipnir-Technology/nidus-sync/db/sql" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" "github.com/alitto/pond/v2" "github.com/jackc/pgx/v5" "github.com/rs/zerolog/log" + "github.com/stephenafamo/bob" + "github.com/stephenafamo/bob/dialect/psql" + "github.com/stephenafamo/bob/dialect/psql/dialect" + "github.com/stephenafamo/bob/dialect/psql/im" + "github.com/uber/h3-go/v4" ) // When the API responds that the token is now invalidated @@ -111,13 +118,13 @@ func updateArcgisUserData(ctx context.Context, user *models.User, access_token s } log.Info().Str("Username", portal.User.Username).Str("user_id", portal.User.ID).Str("org_id", portal.User.OrgID).Str("org_name", portal.Name).Str("license_type_id", portal.User.UserLicenseTypeID).Msg("Got portals data") - _, err = sql.UpdateOauthTokenOrg(portal.User.ID, portal.User.UserLicenseTypeID, refresh_token).Exec(ctx, PGInstance.BobDB) + _, err = sql.UpdateOauthTokenOrg(portal.User.ID, portal.User.UserLicenseTypeID, refresh_token).Exec(ctx, db.PGInstance.BobDB) if err != nil { log.Error().Err(err).Msg("Failed to update oauth token portal data") return } var org *models.Organization - orgs, err := models.Organizations.Query(models.SelectWhere.Organizations.ArcgisName.EQ(portal.Name)).All(ctx, PGInstance.BobDB) + orgs, err := models.Organizations.Query(models.SelectWhere.Organizations.ArcgisName.EQ(portal.Name)).All(ctx, db.PGInstance.BobDB) switch len(orgs) { case 0: setter := models.OrganizationSetter{ @@ -125,7 +132,7 @@ func updateArcgisUserData(ctx context.Context, user *models.User, access_token s ArcgisID: omitnull.From(portal.User.OrgID), ArcgisName: omitnull.From(portal.Name), } - org, err = models.Organizations.Insert(&setter).One(ctx, PGInstance.BobDB) + org, err = models.Organizations.Insert(&setter).One(ctx, db.PGInstance.BobDB) if err != nil { log.Error().Err(err).Msg("Failed to create new organization") return @@ -147,7 +154,7 @@ func updateArcgisUserData(ctx context.Context, user *models.User, access_token s return } } - err = org.AttachUser(ctx, PGInstance.BobDB, user) + err = org.AttachUser(ctx, db.PGInstance.BobDB, user) if err != nil { log.Error().Err(err).Int("user_id", int(user.ID)).Int("org_id", int(org.ID)).Msg("Failed to attach user to organization") return @@ -166,7 +173,7 @@ func updateArcgisUserData(ctx context.Context, user *models.User, access_token s setter := models.OrganizationSetter{ FieldseekerURL: omitnull.From(result.URL), } - err = org.Update(ctx, PGInstance.BobDB, &setter) + err = org.Update(ctx, db.PGInstance.BobDB, &setter) if err != nil { log.Error().Err(err).Msg("Failed to create new organization") return @@ -235,7 +242,7 @@ func handleOauthAccessCode(ctx context.Context, user *models.User, code string) RefreshTokenExpires: omit.From(refreshExpires), Username: omit.From(token.Username), } - err = user.InsertUserOauthTokens(ctx, PGInstance.BobDB, &setter) + err = user.InsertUserOauthTokens(ctx, db.PGInstance.BobDB, &setter) if err != nil { return fmt.Errorf("Failed to save token to database: %w", err) } @@ -244,7 +251,7 @@ func handleOauthAccessCode(ctx context.Context, user *models.User, code string) } func hasFieldseekerConnection(ctx context.Context, user *models.User) (bool, error) { - result, err := sql.OauthTokenByUserId(user.ID).All(ctx, PGInstance.BobDB) + result, err := sql.OauthTokenByUserId(user.ID).All(ctx, db.PGInstance.BobDB) if err != nil { return false, err } @@ -260,7 +267,7 @@ func refreshFieldseekerData(ctx context.Context, newOauthCh <-chan struct{}) { workerCtx, cancel := context.WithCancel(context.Background()) var wg sync.WaitGroup - oauths, err := models.OauthTokens.Query(models.SelectWhere.OauthTokens.InvalidatedAt.IsNull()).All(ctx, PGInstance.BobDB) + oauths, err := models.OauthTokens.Query(models.SelectWhere.OauthTokens.InvalidatedAt.IsNull()).All(ctx, db.PGInstance.BobDB) if err != nil { log.Error().Err(err).Msg("Failed to get oauths") return @@ -281,7 +288,7 @@ func refreshFieldseekerData(ctx context.Context, newOauthCh <-chan struct{}) { }() } - orgs, err := models.Organizations.Query().All(ctx, PGInstance.BobDB) + orgs, err := models.Organizations.Query().All(ctx, db.PGInstance.BobDB) if err != nil { log.Error().Err(err).Msg("Failed to get orgs") return @@ -376,12 +383,12 @@ func downloadAllRecords(ctx context.Context, fssync *fieldseeker.FieldSeeker, la } func getOAuthForOrg(ctx context.Context, org *models.Organization) (*models.OauthToken, error) { - users, err := org.User().All(ctx, PGInstance.BobDB) + users, err := org.User().All(ctx, db.PGInstance.BobDB) if err != nil { return nil, fmt.Errorf("Failed to query all users for org: %w", err) } for _, user := range users { - oauths, err := user.UserOauthTokens(models.SelectWhere.OauthTokens.InvalidatedAt.IsNull()).All(ctx, PGInstance.BobDB) + oauths, err := user.UserOauthTokens(models.SelectWhere.OauthTokens.InvalidatedAt.IsNull()).All(ctx, db.PGInstance.BobDB) if err != nil { return nil, fmt.Errorf("Failed to query all oauth tokens for org: %w", err) } @@ -422,7 +429,7 @@ func exportFieldseekerData(ctx context.Context, org *models.Organization, oauth RefreshTokenExpires: oauth.RefreshTokenExpires, }, ) - row, err := sql.OrgByOauthId(oauth.ID).One(ctx, PGInstance.BobDB) + row, err := sql.OrgByOauthId(oauth.ID).One(ctx, db.PGInstance.BobDB) if err != nil { return fmt.Errorf("Failed to get org ID: %w", err) } @@ -449,7 +456,7 @@ func exportFieldseekerData(ctx context.Context, org *models.Organization, oauth RecordsUpdated: omit.From(int32(stats.Updates)), RecordsUnchanged: omit.From(int32(stats.Unchanged)), } - err = org.InsertFieldseekerSyncs(ctx, PGInstance.BobDB, &setter) + err = org.InsertFieldseekerSyncs(ctx, db.PGInstance.BobDB, &setter) if err != nil { return fmt.Errorf("Failed to insert sync: %w", err) } @@ -461,7 +468,7 @@ func exportFieldseekerData(ctx context.Context, org *models.Organization, oauth func maintainOAuth(ctx context.Context, oauth *models.OauthToken) error { for { // Refresh from the database - oauth, err := models.FindOauthToken(ctx, PGInstance.BobDB, oauth.ID) + oauth, err := models.FindOauthToken(ctx, db.PGInstance.BobDB, oauth.ID) if err != nil { return fmt.Errorf("Failed to update oauth token from database: %w", err) } @@ -503,11 +510,11 @@ func markTokenFailed(ctx context.Context, oauth *models.OauthToken) { oauthSetter := models.OauthTokenSetter{ InvalidatedAt: omitnull.From(time.Now()), } - err := oauth.Update(ctx, PGInstance.BobDB, &oauthSetter) + err := oauth.Update(ctx, db.PGInstance.BobDB, &oauthSetter) if err != nil { log.Error().Str("err", err.Error()).Msg("Failed to mark token failed") } - user, err := models.FindUser(ctx, PGInstance.BobDB, oauth.UserID) + user, err := models.FindUser(ctx, db.PGInstance.BobDB, oauth.UserID) if err != nil { log.Error().Str("err", err.Error()).Msg("Failed to get oauth user") return @@ -541,7 +548,7 @@ func refreshAccessToken(ctx context.Context, oauth *models.OauthToken) error { AccessTokenExpires: omit.From(accessExpires), Username: omit.From(token.Username), } - err = oauth.Update(ctx, PGInstance.BobDB, &setter) + err = oauth.Update(ctx, db.PGInstance.BobDB, &setter) if err != nil { return fmt.Errorf("Failed to update oauth in database: %w", err) } @@ -575,7 +582,7 @@ func refreshRefreshToken(ctx context.Context, oauth *models.OauthToken) error { RefreshTokenExpires: omit.From(refreshExpires), Username: omit.From(token.Username), } - err = oauth.Update(ctx, PGInstance.BobDB, &setter) + err = oauth.Update(ctx, db.PGInstance.BobDB, &setter) if err != nil { return fmt.Errorf("Failed to update oauth in database: %w", err) } @@ -733,7 +740,7 @@ func rowmapViaQuery(ctx context.Context, table string, sorted_columns []string, args := pgx.NamedArgs{ "objectids": objectids, } - rows, err := PGInstance.PGXPool.Query(ctx, query, args) + rows, err := db.PGInstance.PGXPool.Query(ctx, query, args) if err != nil { return result, fmt.Errorf("Failed to query rows: %w", err) } @@ -788,7 +795,7 @@ func rowmapViaQuery(ctx context.Context, table string, sorted_columns []string, func insertRowFromFeature(ctx context.Context, table string, sorted_columns []string, feature *arcgis.Feature, org_id int32) error { var options pgx.TxOptions - transaction, err := PGInstance.PGXPool.BeginTx(ctx, options) + transaction, err := db.PGInstance.PGXPool.BeginTx(ctx, options) if err != nil { return fmt.Errorf("Unable to start transaction") } @@ -915,12 +922,12 @@ func updateRowFromFeature(ctx context.Context, table string, sorted_columns []st args["objectid"] = int(o) var version int - if err := PGInstance.PGXPool.QueryRow(ctx, sb.String(), args).Scan(&version); err != nil { + if err := db.PGInstance.PGXPool.QueryRow(ctx, sb.String(), args).Scan(&version); err != nil { return fmt.Errorf("Failed to query for version: %w", err) } var options pgx.TxOptions - transaction, err := PGInstance.PGXPool.BeginTx(ctx, options) + transaction, err := db.PGInstance.PGXPool.BeginTx(ctx, options) if err != nil { return fmt.Errorf("Unable to start transaction") } @@ -1019,3 +1026,50 @@ func updateRowFromFeatureFS(ctx context.Context, transaction pgx.Tx, table strin } return nil } + +func updateSummaryTables(ctx context.Context, org *models.Organization) { + /*org, err := models.FindOrganization(ctx, PGInstance.BobDB, org_id) + if err != nil { + log.Error().Err(err).Msg("Failed to get organization") + }*/ + log.Info().Int("org_id", int(org.ID)).Msg("Getting point locations") + point_locations, err := org.FSPointlocations().All(ctx, db.PGInstance.BobDB) + if err != nil { + log.Error().Err(err).Msg("Failed to get organization") + return + } + log.Info().Int("count", len(point_locations)).Msg("Summarizing point locations") + + for i := range 16 { + log.Info().Int("resolution", i).Msg("Working summary layer") + cellToCount := make(map[h3.Cell]int, 0) + for _, p := range point_locations { + cell, err := getCell(p.GeometryX, p.GeometryY, i) + if err != nil { + log.Error().Err(err).Msg("Failed to get cell") + continue + } + //log.Info().Float64("X", p.GeometryX).Float64("Y", p.GeometryY).Str("cell", cell.String()).Msg("Converted lat/lng") + cellToCount[cell] = cellToCount[cell] + 1 + } + var to_insert []bob.Mod[*dialect.InsertQuery] = make([]bob.Mod[*dialect.InsertQuery], 0) + to_insert = append(to_insert, im.Into("h3_aggregation", "cell", "resolution", "count_", "type_", "organization_id", "geometry")) + for cell, count := range cellToCount { + polygon, err := cellToPostgisGeometry(cell) + if err != nil { + log.Error().Err(err).Msg("Failed to get PostGIS geometry") + continue + } + // log.Info().Str("polygon", polygon).Msg("Going to insert") + to_insert = append(to_insert, im.Values(psql.Arg(cell.String(), i, count, enums.H3aggregationtypeServicerequest, org.ID), psql.F("st_geomfromtext", psql.S(polygon), 4326))) + } + to_insert = append(to_insert, im.OnConflict("cell, organization_id, type_").DoUpdate( + im.SetCol("count_").To(psql.Raw("EXCLUDED.count_")), + )) + //log.Info().Str("sql", insertQueryToString(psql.Insert(to_insert...))).Msg("Updating...") + _, err := psql.Insert(to_insert...).Exec(ctx, db.PGInstance.BobDB) + if err != nil { + log.Error().Err(err).Msg("Faild to add h3 aggregation") + } + } +} diff --git a/auth.go b/auth.go index 8a6856d1..4b17464c 100644 --- a/auth.go +++ b/auth.go @@ -8,9 +8,10 @@ import ( "net/http" "strconv" - "github.com/Gleipnir-Technology/nidus-sync/enums" - "github.com/Gleipnir-Technology/nidus-sync/models" - "github.com/Gleipnir-Technology/nidus-sync/sql" + "github.com/Gleipnir-Technology/nidus-sync/db" + "github.com/Gleipnir-Technology/nidus-sync/db/enums" + "github.com/Gleipnir-Technology/nidus-sync/db/models" + "github.com/Gleipnir-Technology/nidus-sync/db/sql" "github.com/aarondl/opt/omit" "golang.org/x/crypto/bcrypt" ) @@ -85,7 +86,7 @@ func addUserSession(r *http.Request, user *models.User) { // Helper function to translate strings into solid error types for operating on func findUser(ctx context.Context, user_id int) (*models.User, error) { - user, err := models.FindUser(ctx, PGInstance.BobDB, int32(user_id)) + user, err := models.FindUser(ctx, db.PGInstance.BobDB, int32(user_id)) if err != nil { if err.Error() == "No such user" { return nil, &NoUserError{} @@ -155,7 +156,7 @@ func signupUser(username string, name string, password string) (*models.User, er PasswordHashType: omit.From(enums.HashtypeBcrypt14), Username: omit.From(username), } - u, err := models.Users.Insert(&setter).One(context.TODO(), PGInstance.BobDB) + u, err := models.Users.Insert(&setter).One(context.TODO(), db.PGInstance.BobDB) if err != nil { return nil, fmt.Errorf("Failed to create user: %w", err) } @@ -180,7 +181,7 @@ func validateUser(ctx context.Context, username string, password string) (*model slog.String("username", username), slog.String("password", password), slog.String("hash", passwordHash)) - result, err := sql.UserByUsername(username).All(ctx, PGInstance.BobDB) + result, err := sql.UserByUsername(username).All(ctx, db.PGInstance.BobDB) if err != nil { return nil, fmt.Errorf("Failed to query for user: %w", err) } diff --git a/bob b/db/bob similarity index 100% rename from bob rename to db/bob diff --git a/bobgen.yaml b/db/bobgen.yaml similarity index 100% rename from bobgen.yaml rename to db/bobgen.yaml diff --git a/database.go b/db/connection.go similarity index 62% rename from database.go rename to db/connection.go index 021524e9..0e446a33 100644 --- a/database.go +++ b/db/connection.go @@ -1,4 +1,4 @@ -package main +package db import ( "context" @@ -11,18 +11,12 @@ import ( //"github.com/georgysavva/scany/v2/pgxscan" //"github.com/jackc/pgx/v5" - "github.com/Gleipnir-Technology/nidus-sync/enums" - "github.com/Gleipnir-Technology/nidus-sync/models" "github.com/jackc/pgx/v5/pgxpool" "github.com/jackc/pgx/v5/stdlib" _ "github.com/jackc/pgx/v5/stdlib" "github.com/pressly/goose/v3" "github.com/rs/zerolog/log" "github.com/stephenafamo/bob" - "github.com/stephenafamo/bob/dialect/psql" - "github.com/stephenafamo/bob/dialect/psql/dialect" - "github.com/stephenafamo/bob/dialect/psql/im" - "github.com/uber/h3-go/v4" ) //go:embed migrations/*.sql @@ -81,7 +75,7 @@ func doMigrations(connection_string string) error { return nil } -func initializeDatabase(ctx context.Context, uri string) error { +func InitializeDatabase(ctx context.Context, uri string) error { needs, err := needsMigrations(uri) if err != nil { return fmt.Errorf("Failed to determine if migrations are needed: %w", err) @@ -149,50 +143,3 @@ func needsMigrations(connection_string string) (*bool, error) { } return &hasPending, nil } - -func updateSummaryTables(ctx context.Context, org *models.Organization) { - /*org, err := models.FindOrganization(ctx, PGInstance.BobDB, org_id) - if err != nil { - log.Error().Err(err).Msg("Failed to get organization") - }*/ - log.Info().Int("org_id", int(org.ID)).Msg("Getting point locations") - point_locations, err := org.FSPointlocations().All(ctx, PGInstance.BobDB) - if err != nil { - log.Error().Err(err).Msg("Failed to get organization") - return - } - log.Info().Int("count", len(point_locations)).Msg("Summarizing point locations") - - for i := range 16 { - log.Info().Int("resolution", i).Msg("Working summary layer") - cellToCount := make(map[h3.Cell]int, 0) - for _, p := range point_locations { - cell, err := getCell(p.GeometryX, p.GeometryY, i) - if err != nil { - log.Error().Err(err).Msg("Failed to get cell") - continue - } - //log.Info().Float64("X", p.GeometryX).Float64("Y", p.GeometryY).Str("cell", cell.String()).Msg("Converted lat/lng") - cellToCount[cell] = cellToCount[cell] + 1 - } - var to_insert []bob.Mod[*dialect.InsertQuery] = make([]bob.Mod[*dialect.InsertQuery], 0) - to_insert = append(to_insert, im.Into("h3_aggregation", "cell", "resolution", "count_", "type_", "organization_id", "geometry")) - for cell, count := range cellToCount { - polygon, err := cellToPostgisGeometry(cell) - if err != nil { - log.Error().Err(err).Msg("Failed to get PostGIS geometry") - continue - } - // log.Info().Str("polygon", polygon).Msg("Going to insert") - to_insert = append(to_insert, im.Values(psql.Arg(cell.String(), i, count, enums.H3aggregationtypeServicerequest, org.ID), psql.F("st_geomfromtext", psql.S(polygon), 4326))) - } - to_insert = append(to_insert, im.OnConflict("cell, organization_id, type_").DoUpdate( - im.SetCol("count_").To(psql.Raw("EXCLUDED.count_")), - )) - //log.Info().Str("sql", insertQueryToString(psql.Insert(to_insert...))).Msg("Updating...") - _, err := psql.Insert(to_insert...).Exec(ctx, PGInstance.BobDB) - if err != nil { - log.Error().Err(err).Msg("Faild to add h3 aggregation") - } - } -} diff --git a/dberrors/bob_errors.bob.go b/db/dberrors/bob_errors.bob.go similarity index 100% rename from dberrors/bob_errors.bob.go rename to db/dberrors/bob_errors.bob.go diff --git a/dberrors/bob_main.bob_test.go b/db/dberrors/bob_main.bob_test.go similarity index 100% rename from dberrors/bob_main.bob_test.go rename to db/dberrors/bob_main.bob_test.go diff --git a/dberrors/fieldseeker_sync.bob.go b/db/dberrors/fieldseeker_sync.bob.go similarity index 100% rename from dberrors/fieldseeker_sync.bob.go rename to db/dberrors/fieldseeker_sync.bob.go diff --git a/dberrors/fs_containerrelate.bob.go b/db/dberrors/fs_containerrelate.bob.go similarity index 100% rename from dberrors/fs_containerrelate.bob.go rename to db/dberrors/fs_containerrelate.bob.go diff --git a/dberrors/fs_fieldscoutinglog.bob.go b/db/dberrors/fs_fieldscoutinglog.bob.go similarity index 100% rename from dberrors/fs_fieldscoutinglog.bob.go rename to db/dberrors/fs_fieldscoutinglog.bob.go diff --git a/dberrors/fs_habitatrelate.bob.go b/db/dberrors/fs_habitatrelate.bob.go similarity index 100% rename from dberrors/fs_habitatrelate.bob.go rename to db/dberrors/fs_habitatrelate.bob.go diff --git a/dberrors/fs_inspectionsample.bob.go b/db/dberrors/fs_inspectionsample.bob.go similarity index 100% rename from dberrors/fs_inspectionsample.bob.go rename to db/dberrors/fs_inspectionsample.bob.go diff --git a/dberrors/fs_inspectionsampledetail.bob.go b/db/dberrors/fs_inspectionsampledetail.bob.go similarity index 100% rename from dberrors/fs_inspectionsampledetail.bob.go rename to db/dberrors/fs_inspectionsampledetail.bob.go diff --git a/dberrors/fs_linelocation.bob.go b/db/dberrors/fs_linelocation.bob.go similarity index 100% rename from dberrors/fs_linelocation.bob.go rename to db/dberrors/fs_linelocation.bob.go diff --git a/dberrors/fs_locationtracking.bob.go b/db/dberrors/fs_locationtracking.bob.go similarity index 100% rename from dberrors/fs_locationtracking.bob.go rename to db/dberrors/fs_locationtracking.bob.go diff --git a/dberrors/fs_mosquitoinspection.bob.go b/db/dberrors/fs_mosquitoinspection.bob.go similarity index 100% rename from dberrors/fs_mosquitoinspection.bob.go rename to db/dberrors/fs_mosquitoinspection.bob.go diff --git a/dberrors/fs_pointlocation.bob.go b/db/dberrors/fs_pointlocation.bob.go similarity index 100% rename from dberrors/fs_pointlocation.bob.go rename to db/dberrors/fs_pointlocation.bob.go diff --git a/dberrors/fs_polygonlocation.bob.go b/db/dberrors/fs_polygonlocation.bob.go similarity index 100% rename from dberrors/fs_polygonlocation.bob.go rename to db/dberrors/fs_polygonlocation.bob.go diff --git a/dberrors/fs_pool.bob.go b/db/dberrors/fs_pool.bob.go similarity index 100% rename from dberrors/fs_pool.bob.go rename to db/dberrors/fs_pool.bob.go diff --git a/dberrors/fs_pooldetail.bob.go b/db/dberrors/fs_pooldetail.bob.go similarity index 100% rename from dberrors/fs_pooldetail.bob.go rename to db/dberrors/fs_pooldetail.bob.go diff --git a/dberrors/fs_proposedtreatmentarea.bob.go b/db/dberrors/fs_proposedtreatmentarea.bob.go similarity index 100% rename from dberrors/fs_proposedtreatmentarea.bob.go rename to db/dberrors/fs_proposedtreatmentarea.bob.go diff --git a/dberrors/fs_qamosquitoinspection.bob.go b/db/dberrors/fs_qamosquitoinspection.bob.go similarity index 100% rename from dberrors/fs_qamosquitoinspection.bob.go rename to db/dberrors/fs_qamosquitoinspection.bob.go diff --git a/dberrors/fs_rodentlocation.bob.go b/db/dberrors/fs_rodentlocation.bob.go similarity index 100% rename from dberrors/fs_rodentlocation.bob.go rename to db/dberrors/fs_rodentlocation.bob.go diff --git a/dberrors/fs_samplecollection.bob.go b/db/dberrors/fs_samplecollection.bob.go similarity index 100% rename from dberrors/fs_samplecollection.bob.go rename to db/dberrors/fs_samplecollection.bob.go diff --git a/dberrors/fs_samplelocation.bob.go b/db/dberrors/fs_samplelocation.bob.go similarity index 100% rename from dberrors/fs_samplelocation.bob.go rename to db/dberrors/fs_samplelocation.bob.go diff --git a/dberrors/fs_servicerequest.bob.go b/db/dberrors/fs_servicerequest.bob.go similarity index 100% rename from dberrors/fs_servicerequest.bob.go rename to db/dberrors/fs_servicerequest.bob.go diff --git a/dberrors/fs_speciesabundance.bob.go b/db/dberrors/fs_speciesabundance.bob.go similarity index 100% rename from dberrors/fs_speciesabundance.bob.go rename to db/dberrors/fs_speciesabundance.bob.go diff --git a/dberrors/fs_stormdrain.bob.go b/db/dberrors/fs_stormdrain.bob.go similarity index 100% rename from dberrors/fs_stormdrain.bob.go rename to db/dberrors/fs_stormdrain.bob.go diff --git a/dberrors/fs_timecard.bob.go b/db/dberrors/fs_timecard.bob.go similarity index 100% rename from dberrors/fs_timecard.bob.go rename to db/dberrors/fs_timecard.bob.go diff --git a/dberrors/fs_trapdata.bob.go b/db/dberrors/fs_trapdata.bob.go similarity index 100% rename from dberrors/fs_trapdata.bob.go rename to db/dberrors/fs_trapdata.bob.go diff --git a/dberrors/fs_traplocation.bob.go b/db/dberrors/fs_traplocation.bob.go similarity index 100% rename from dberrors/fs_traplocation.bob.go rename to db/dberrors/fs_traplocation.bob.go diff --git a/dberrors/fs_treatment.bob.go b/db/dberrors/fs_treatment.bob.go similarity index 100% rename from dberrors/fs_treatment.bob.go rename to db/dberrors/fs_treatment.bob.go diff --git a/dberrors/fs_treatmentarea.bob.go b/db/dberrors/fs_treatmentarea.bob.go similarity index 100% rename from dberrors/fs_treatmentarea.bob.go rename to db/dberrors/fs_treatmentarea.bob.go diff --git a/dberrors/fs_zones.bob.go b/db/dberrors/fs_zones.bob.go similarity index 100% rename from dberrors/fs_zones.bob.go rename to db/dberrors/fs_zones.bob.go diff --git a/dberrors/fs_zones2.bob.go b/db/dberrors/fs_zones2.bob.go similarity index 100% rename from dberrors/fs_zones2.bob.go rename to db/dberrors/fs_zones2.bob.go diff --git a/dberrors/goose_db_version.bob.go b/db/dberrors/goose_db_version.bob.go similarity index 100% rename from dberrors/goose_db_version.bob.go rename to db/dberrors/goose_db_version.bob.go diff --git a/dberrors/h3_aggregation.bob.go b/db/dberrors/h3_aggregation.bob.go similarity index 100% rename from dberrors/h3_aggregation.bob.go rename to db/dberrors/h3_aggregation.bob.go diff --git a/dberrors/h3_aggregation.bob_test.go b/db/dberrors/h3_aggregation.bob_test.go similarity index 96% rename from dberrors/h3_aggregation.bob_test.go rename to db/dberrors/h3_aggregation.bob_test.go index 8e143f07..6b3c05d0 100644 --- a/dberrors/h3_aggregation.bob_test.go +++ b/db/dberrors/h3_aggregation.bob_test.go @@ -8,8 +8,8 @@ import ( "errors" "testing" - factory "github.com/Gleipnir-Technology/nidus-sync/factory" - models "github.com/Gleipnir-Technology/nidus-sync/models" + factory "github.com/Gleipnir-Technology/nidus-sync/db/factory" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/stephenafamo/bob" ) diff --git a/dberrors/history_containerrelate.bob.go b/db/dberrors/history_containerrelate.bob.go similarity index 100% rename from dberrors/history_containerrelate.bob.go rename to db/dberrors/history_containerrelate.bob.go diff --git a/dberrors/history_fieldscoutinglog.bob.go b/db/dberrors/history_fieldscoutinglog.bob.go similarity index 100% rename from dberrors/history_fieldscoutinglog.bob.go rename to db/dberrors/history_fieldscoutinglog.bob.go diff --git a/dberrors/history_habitatrelate.bob.go b/db/dberrors/history_habitatrelate.bob.go similarity index 100% rename from dberrors/history_habitatrelate.bob.go rename to db/dberrors/history_habitatrelate.bob.go diff --git a/dberrors/history_inspectionsample.bob.go b/db/dberrors/history_inspectionsample.bob.go similarity index 100% rename from dberrors/history_inspectionsample.bob.go rename to db/dberrors/history_inspectionsample.bob.go diff --git a/dberrors/history_inspectionsampledetail.bob.go b/db/dberrors/history_inspectionsampledetail.bob.go similarity index 100% rename from dberrors/history_inspectionsampledetail.bob.go rename to db/dberrors/history_inspectionsampledetail.bob.go diff --git a/dberrors/history_linelocation.bob.go b/db/dberrors/history_linelocation.bob.go similarity index 100% rename from dberrors/history_linelocation.bob.go rename to db/dberrors/history_linelocation.bob.go diff --git a/dberrors/history_locationtracking.bob.go b/db/dberrors/history_locationtracking.bob.go similarity index 100% rename from dberrors/history_locationtracking.bob.go rename to db/dberrors/history_locationtracking.bob.go diff --git a/dberrors/history_mosquitoinspection.bob.go b/db/dberrors/history_mosquitoinspection.bob.go similarity index 100% rename from dberrors/history_mosquitoinspection.bob.go rename to db/dberrors/history_mosquitoinspection.bob.go diff --git a/dberrors/history_pointlocation.bob.go b/db/dberrors/history_pointlocation.bob.go similarity index 100% rename from dberrors/history_pointlocation.bob.go rename to db/dberrors/history_pointlocation.bob.go diff --git a/dberrors/history_polygonlocation.bob.go b/db/dberrors/history_polygonlocation.bob.go similarity index 100% rename from dberrors/history_polygonlocation.bob.go rename to db/dberrors/history_polygonlocation.bob.go diff --git a/dberrors/history_pool.bob.go b/db/dberrors/history_pool.bob.go similarity index 100% rename from dberrors/history_pool.bob.go rename to db/dberrors/history_pool.bob.go diff --git a/dberrors/history_pooldetail.bob.go b/db/dberrors/history_pooldetail.bob.go similarity index 100% rename from dberrors/history_pooldetail.bob.go rename to db/dberrors/history_pooldetail.bob.go diff --git a/dberrors/history_proposedtreatmentarea.bob.go b/db/dberrors/history_proposedtreatmentarea.bob.go similarity index 100% rename from dberrors/history_proposedtreatmentarea.bob.go rename to db/dberrors/history_proposedtreatmentarea.bob.go diff --git a/dberrors/history_qamosquitoinspection.bob.go b/db/dberrors/history_qamosquitoinspection.bob.go similarity index 100% rename from dberrors/history_qamosquitoinspection.bob.go rename to db/dberrors/history_qamosquitoinspection.bob.go diff --git a/dberrors/history_rodentlocation.bob.go b/db/dberrors/history_rodentlocation.bob.go similarity index 100% rename from dberrors/history_rodentlocation.bob.go rename to db/dberrors/history_rodentlocation.bob.go diff --git a/dberrors/history_samplecollection.bob.go b/db/dberrors/history_samplecollection.bob.go similarity index 100% rename from dberrors/history_samplecollection.bob.go rename to db/dberrors/history_samplecollection.bob.go diff --git a/dberrors/history_samplelocation.bob.go b/db/dberrors/history_samplelocation.bob.go similarity index 100% rename from dberrors/history_samplelocation.bob.go rename to db/dberrors/history_samplelocation.bob.go diff --git a/dberrors/history_servicerequest.bob.go b/db/dberrors/history_servicerequest.bob.go similarity index 100% rename from dberrors/history_servicerequest.bob.go rename to db/dberrors/history_servicerequest.bob.go diff --git a/dberrors/history_speciesabundance.bob.go b/db/dberrors/history_speciesabundance.bob.go similarity index 100% rename from dberrors/history_speciesabundance.bob.go rename to db/dberrors/history_speciesabundance.bob.go diff --git a/dberrors/history_stormdrain.bob.go b/db/dberrors/history_stormdrain.bob.go similarity index 100% rename from dberrors/history_stormdrain.bob.go rename to db/dberrors/history_stormdrain.bob.go diff --git a/dberrors/history_timecard.bob.go b/db/dberrors/history_timecard.bob.go similarity index 100% rename from dberrors/history_timecard.bob.go rename to db/dberrors/history_timecard.bob.go diff --git a/dberrors/history_trapdata.bob.go b/db/dberrors/history_trapdata.bob.go similarity index 100% rename from dberrors/history_trapdata.bob.go rename to db/dberrors/history_trapdata.bob.go diff --git a/dberrors/history_traplocation.bob.go b/db/dberrors/history_traplocation.bob.go similarity index 100% rename from dberrors/history_traplocation.bob.go rename to db/dberrors/history_traplocation.bob.go diff --git a/dberrors/history_treatment.bob.go b/db/dberrors/history_treatment.bob.go similarity index 100% rename from dberrors/history_treatment.bob.go rename to db/dberrors/history_treatment.bob.go diff --git a/dberrors/history_treatmentarea.bob.go b/db/dberrors/history_treatmentarea.bob.go similarity index 100% rename from dberrors/history_treatmentarea.bob.go rename to db/dberrors/history_treatmentarea.bob.go diff --git a/dberrors/history_zones.bob.go b/db/dberrors/history_zones.bob.go similarity index 100% rename from dberrors/history_zones.bob.go rename to db/dberrors/history_zones.bob.go diff --git a/dberrors/history_zones2.bob.go b/db/dberrors/history_zones2.bob.go similarity index 100% rename from dberrors/history_zones2.bob.go rename to db/dberrors/history_zones2.bob.go diff --git a/dberrors/notification.bob.go b/db/dberrors/notification.bob.go similarity index 100% rename from dberrors/notification.bob.go rename to db/dberrors/notification.bob.go diff --git a/dberrors/oauth_token.bob.go b/db/dberrors/oauth_token.bob.go similarity index 100% rename from dberrors/oauth_token.bob.go rename to db/dberrors/oauth_token.bob.go diff --git a/dberrors/organization.bob.go b/db/dberrors/organization.bob.go similarity index 100% rename from dberrors/organization.bob.go rename to db/dberrors/organization.bob.go diff --git a/dberrors/sessions.bob.go b/db/dberrors/sessions.bob.go similarity index 100% rename from dberrors/sessions.bob.go rename to db/dberrors/sessions.bob.go diff --git a/dberrors/spatial_ref_sys.bob.go b/db/dberrors/spatial_ref_sys.bob.go similarity index 100% rename from dberrors/spatial_ref_sys.bob.go rename to db/dberrors/spatial_ref_sys.bob.go diff --git a/dberrors/user_.bob.go b/db/dberrors/user_.bob.go similarity index 100% rename from dberrors/user_.bob.go rename to db/dberrors/user_.bob.go diff --git a/dbinfo/bob_types.bob.go b/db/dbinfo/bob_types.bob.go similarity index 100% rename from dbinfo/bob_types.bob.go rename to db/dbinfo/bob_types.bob.go diff --git a/dbinfo/fieldseeker_sync.bob.go b/db/dbinfo/fieldseeker_sync.bob.go similarity index 100% rename from dbinfo/fieldseeker_sync.bob.go rename to db/dbinfo/fieldseeker_sync.bob.go diff --git a/dbinfo/fs_containerrelate.bob.go b/db/dbinfo/fs_containerrelate.bob.go similarity index 100% rename from dbinfo/fs_containerrelate.bob.go rename to db/dbinfo/fs_containerrelate.bob.go diff --git a/dbinfo/fs_fieldscoutinglog.bob.go b/db/dbinfo/fs_fieldscoutinglog.bob.go similarity index 100% rename from dbinfo/fs_fieldscoutinglog.bob.go rename to db/dbinfo/fs_fieldscoutinglog.bob.go diff --git a/dbinfo/fs_habitatrelate.bob.go b/db/dbinfo/fs_habitatrelate.bob.go similarity index 100% rename from dbinfo/fs_habitatrelate.bob.go rename to db/dbinfo/fs_habitatrelate.bob.go diff --git a/dbinfo/fs_inspectionsample.bob.go b/db/dbinfo/fs_inspectionsample.bob.go similarity index 100% rename from dbinfo/fs_inspectionsample.bob.go rename to db/dbinfo/fs_inspectionsample.bob.go diff --git a/dbinfo/fs_inspectionsampledetail.bob.go b/db/dbinfo/fs_inspectionsampledetail.bob.go similarity index 100% rename from dbinfo/fs_inspectionsampledetail.bob.go rename to db/dbinfo/fs_inspectionsampledetail.bob.go diff --git a/dbinfo/fs_linelocation.bob.go b/db/dbinfo/fs_linelocation.bob.go similarity index 100% rename from dbinfo/fs_linelocation.bob.go rename to db/dbinfo/fs_linelocation.bob.go diff --git a/dbinfo/fs_locationtracking.bob.go b/db/dbinfo/fs_locationtracking.bob.go similarity index 100% rename from dbinfo/fs_locationtracking.bob.go rename to db/dbinfo/fs_locationtracking.bob.go diff --git a/dbinfo/fs_mosquitoinspection.bob.go b/db/dbinfo/fs_mosquitoinspection.bob.go similarity index 100% rename from dbinfo/fs_mosquitoinspection.bob.go rename to db/dbinfo/fs_mosquitoinspection.bob.go diff --git a/dbinfo/fs_pointlocation.bob.go b/db/dbinfo/fs_pointlocation.bob.go similarity index 100% rename from dbinfo/fs_pointlocation.bob.go rename to db/dbinfo/fs_pointlocation.bob.go diff --git a/dbinfo/fs_polygonlocation.bob.go b/db/dbinfo/fs_polygonlocation.bob.go similarity index 100% rename from dbinfo/fs_polygonlocation.bob.go rename to db/dbinfo/fs_polygonlocation.bob.go diff --git a/dbinfo/fs_pool.bob.go b/db/dbinfo/fs_pool.bob.go similarity index 100% rename from dbinfo/fs_pool.bob.go rename to db/dbinfo/fs_pool.bob.go diff --git a/dbinfo/fs_pooldetail.bob.go b/db/dbinfo/fs_pooldetail.bob.go similarity index 100% rename from dbinfo/fs_pooldetail.bob.go rename to db/dbinfo/fs_pooldetail.bob.go diff --git a/dbinfo/fs_proposedtreatmentarea.bob.go b/db/dbinfo/fs_proposedtreatmentarea.bob.go similarity index 100% rename from dbinfo/fs_proposedtreatmentarea.bob.go rename to db/dbinfo/fs_proposedtreatmentarea.bob.go diff --git a/dbinfo/fs_qamosquitoinspection.bob.go b/db/dbinfo/fs_qamosquitoinspection.bob.go similarity index 100% rename from dbinfo/fs_qamosquitoinspection.bob.go rename to db/dbinfo/fs_qamosquitoinspection.bob.go diff --git a/dbinfo/fs_rodentlocation.bob.go b/db/dbinfo/fs_rodentlocation.bob.go similarity index 100% rename from dbinfo/fs_rodentlocation.bob.go rename to db/dbinfo/fs_rodentlocation.bob.go diff --git a/dbinfo/fs_samplecollection.bob.go b/db/dbinfo/fs_samplecollection.bob.go similarity index 100% rename from dbinfo/fs_samplecollection.bob.go rename to db/dbinfo/fs_samplecollection.bob.go diff --git a/dbinfo/fs_samplelocation.bob.go b/db/dbinfo/fs_samplelocation.bob.go similarity index 100% rename from dbinfo/fs_samplelocation.bob.go rename to db/dbinfo/fs_samplelocation.bob.go diff --git a/dbinfo/fs_servicerequest.bob.go b/db/dbinfo/fs_servicerequest.bob.go similarity index 100% rename from dbinfo/fs_servicerequest.bob.go rename to db/dbinfo/fs_servicerequest.bob.go diff --git a/dbinfo/fs_speciesabundance.bob.go b/db/dbinfo/fs_speciesabundance.bob.go similarity index 100% rename from dbinfo/fs_speciesabundance.bob.go rename to db/dbinfo/fs_speciesabundance.bob.go diff --git a/dbinfo/fs_stormdrain.bob.go b/db/dbinfo/fs_stormdrain.bob.go similarity index 100% rename from dbinfo/fs_stormdrain.bob.go rename to db/dbinfo/fs_stormdrain.bob.go diff --git a/dbinfo/fs_timecard.bob.go b/db/dbinfo/fs_timecard.bob.go similarity index 100% rename from dbinfo/fs_timecard.bob.go rename to db/dbinfo/fs_timecard.bob.go diff --git a/dbinfo/fs_trapdata.bob.go b/db/dbinfo/fs_trapdata.bob.go similarity index 100% rename from dbinfo/fs_trapdata.bob.go rename to db/dbinfo/fs_trapdata.bob.go diff --git a/dbinfo/fs_traplocation.bob.go b/db/dbinfo/fs_traplocation.bob.go similarity index 100% rename from dbinfo/fs_traplocation.bob.go rename to db/dbinfo/fs_traplocation.bob.go diff --git a/dbinfo/fs_treatment.bob.go b/db/dbinfo/fs_treatment.bob.go similarity index 100% rename from dbinfo/fs_treatment.bob.go rename to db/dbinfo/fs_treatment.bob.go diff --git a/dbinfo/fs_treatmentarea.bob.go b/db/dbinfo/fs_treatmentarea.bob.go similarity index 100% rename from dbinfo/fs_treatmentarea.bob.go rename to db/dbinfo/fs_treatmentarea.bob.go diff --git a/dbinfo/fs_zones.bob.go b/db/dbinfo/fs_zones.bob.go similarity index 100% rename from dbinfo/fs_zones.bob.go rename to db/dbinfo/fs_zones.bob.go diff --git a/dbinfo/fs_zones2.bob.go b/db/dbinfo/fs_zones2.bob.go similarity index 100% rename from dbinfo/fs_zones2.bob.go rename to db/dbinfo/fs_zones2.bob.go diff --git a/dbinfo/geography_columns.bob.go b/db/dbinfo/geography_columns.bob.go similarity index 100% rename from dbinfo/geography_columns.bob.go rename to db/dbinfo/geography_columns.bob.go diff --git a/dbinfo/geometry_columns.bob.go b/db/dbinfo/geometry_columns.bob.go similarity index 100% rename from dbinfo/geometry_columns.bob.go rename to db/dbinfo/geometry_columns.bob.go diff --git a/dbinfo/goose_db_version.bob.go b/db/dbinfo/goose_db_version.bob.go similarity index 100% rename from dbinfo/goose_db_version.bob.go rename to db/dbinfo/goose_db_version.bob.go diff --git a/dbinfo/h3_aggregation.bob.go b/db/dbinfo/h3_aggregation.bob.go similarity index 100% rename from dbinfo/h3_aggregation.bob.go rename to db/dbinfo/h3_aggregation.bob.go diff --git a/dbinfo/history_containerrelate.bob.go b/db/dbinfo/history_containerrelate.bob.go similarity index 100% rename from dbinfo/history_containerrelate.bob.go rename to db/dbinfo/history_containerrelate.bob.go diff --git a/dbinfo/history_fieldscoutinglog.bob.go b/db/dbinfo/history_fieldscoutinglog.bob.go similarity index 100% rename from dbinfo/history_fieldscoutinglog.bob.go rename to db/dbinfo/history_fieldscoutinglog.bob.go diff --git a/dbinfo/history_habitatrelate.bob.go b/db/dbinfo/history_habitatrelate.bob.go similarity index 100% rename from dbinfo/history_habitatrelate.bob.go rename to db/dbinfo/history_habitatrelate.bob.go diff --git a/dbinfo/history_inspectionsample.bob.go b/db/dbinfo/history_inspectionsample.bob.go similarity index 100% rename from dbinfo/history_inspectionsample.bob.go rename to db/dbinfo/history_inspectionsample.bob.go diff --git a/dbinfo/history_inspectionsampledetail.bob.go b/db/dbinfo/history_inspectionsampledetail.bob.go similarity index 100% rename from dbinfo/history_inspectionsampledetail.bob.go rename to db/dbinfo/history_inspectionsampledetail.bob.go diff --git a/dbinfo/history_linelocation.bob.go b/db/dbinfo/history_linelocation.bob.go similarity index 100% rename from dbinfo/history_linelocation.bob.go rename to db/dbinfo/history_linelocation.bob.go diff --git a/dbinfo/history_locationtracking.bob.go b/db/dbinfo/history_locationtracking.bob.go similarity index 100% rename from dbinfo/history_locationtracking.bob.go rename to db/dbinfo/history_locationtracking.bob.go diff --git a/dbinfo/history_mosquitoinspection.bob.go b/db/dbinfo/history_mosquitoinspection.bob.go similarity index 100% rename from dbinfo/history_mosquitoinspection.bob.go rename to db/dbinfo/history_mosquitoinspection.bob.go diff --git a/dbinfo/history_pointlocation.bob.go b/db/dbinfo/history_pointlocation.bob.go similarity index 100% rename from dbinfo/history_pointlocation.bob.go rename to db/dbinfo/history_pointlocation.bob.go diff --git a/dbinfo/history_polygonlocation.bob.go b/db/dbinfo/history_polygonlocation.bob.go similarity index 100% rename from dbinfo/history_polygonlocation.bob.go rename to db/dbinfo/history_polygonlocation.bob.go diff --git a/dbinfo/history_pool.bob.go b/db/dbinfo/history_pool.bob.go similarity index 100% rename from dbinfo/history_pool.bob.go rename to db/dbinfo/history_pool.bob.go diff --git a/dbinfo/history_pooldetail.bob.go b/db/dbinfo/history_pooldetail.bob.go similarity index 100% rename from dbinfo/history_pooldetail.bob.go rename to db/dbinfo/history_pooldetail.bob.go diff --git a/dbinfo/history_proposedtreatmentarea.bob.go b/db/dbinfo/history_proposedtreatmentarea.bob.go similarity index 100% rename from dbinfo/history_proposedtreatmentarea.bob.go rename to db/dbinfo/history_proposedtreatmentarea.bob.go diff --git a/dbinfo/history_qamosquitoinspection.bob.go b/db/dbinfo/history_qamosquitoinspection.bob.go similarity index 100% rename from dbinfo/history_qamosquitoinspection.bob.go rename to db/dbinfo/history_qamosquitoinspection.bob.go diff --git a/dbinfo/history_rodentlocation.bob.go b/db/dbinfo/history_rodentlocation.bob.go similarity index 100% rename from dbinfo/history_rodentlocation.bob.go rename to db/dbinfo/history_rodentlocation.bob.go diff --git a/dbinfo/history_samplecollection.bob.go b/db/dbinfo/history_samplecollection.bob.go similarity index 100% rename from dbinfo/history_samplecollection.bob.go rename to db/dbinfo/history_samplecollection.bob.go diff --git a/dbinfo/history_samplelocation.bob.go b/db/dbinfo/history_samplelocation.bob.go similarity index 100% rename from dbinfo/history_samplelocation.bob.go rename to db/dbinfo/history_samplelocation.bob.go diff --git a/dbinfo/history_servicerequest.bob.go b/db/dbinfo/history_servicerequest.bob.go similarity index 100% rename from dbinfo/history_servicerequest.bob.go rename to db/dbinfo/history_servicerequest.bob.go diff --git a/dbinfo/history_speciesabundance.bob.go b/db/dbinfo/history_speciesabundance.bob.go similarity index 100% rename from dbinfo/history_speciesabundance.bob.go rename to db/dbinfo/history_speciesabundance.bob.go diff --git a/dbinfo/history_stormdrain.bob.go b/db/dbinfo/history_stormdrain.bob.go similarity index 100% rename from dbinfo/history_stormdrain.bob.go rename to db/dbinfo/history_stormdrain.bob.go diff --git a/dbinfo/history_timecard.bob.go b/db/dbinfo/history_timecard.bob.go similarity index 100% rename from dbinfo/history_timecard.bob.go rename to db/dbinfo/history_timecard.bob.go diff --git a/dbinfo/history_trapdata.bob.go b/db/dbinfo/history_trapdata.bob.go similarity index 100% rename from dbinfo/history_trapdata.bob.go rename to db/dbinfo/history_trapdata.bob.go diff --git a/dbinfo/history_traplocation.bob.go b/db/dbinfo/history_traplocation.bob.go similarity index 100% rename from dbinfo/history_traplocation.bob.go rename to db/dbinfo/history_traplocation.bob.go diff --git a/dbinfo/history_treatment.bob.go b/db/dbinfo/history_treatment.bob.go similarity index 100% rename from dbinfo/history_treatment.bob.go rename to db/dbinfo/history_treatment.bob.go diff --git a/dbinfo/history_treatmentarea.bob.go b/db/dbinfo/history_treatmentarea.bob.go similarity index 100% rename from dbinfo/history_treatmentarea.bob.go rename to db/dbinfo/history_treatmentarea.bob.go diff --git a/dbinfo/history_zones.bob.go b/db/dbinfo/history_zones.bob.go similarity index 100% rename from dbinfo/history_zones.bob.go rename to db/dbinfo/history_zones.bob.go diff --git a/dbinfo/history_zones2.bob.go b/db/dbinfo/history_zones2.bob.go similarity index 100% rename from dbinfo/history_zones2.bob.go rename to db/dbinfo/history_zones2.bob.go diff --git a/dbinfo/notification.bob.go b/db/dbinfo/notification.bob.go similarity index 100% rename from dbinfo/notification.bob.go rename to db/dbinfo/notification.bob.go diff --git a/dbinfo/oauth_token.bob.go b/db/dbinfo/oauth_token.bob.go similarity index 100% rename from dbinfo/oauth_token.bob.go rename to db/dbinfo/oauth_token.bob.go diff --git a/dbinfo/organization.bob.go b/db/dbinfo/organization.bob.go similarity index 100% rename from dbinfo/organization.bob.go rename to db/dbinfo/organization.bob.go diff --git a/dbinfo/raster_columns.bob.go b/db/dbinfo/raster_columns.bob.go similarity index 100% rename from dbinfo/raster_columns.bob.go rename to db/dbinfo/raster_columns.bob.go diff --git a/dbinfo/raster_overviews.bob.go b/db/dbinfo/raster_overviews.bob.go similarity index 100% rename from dbinfo/raster_overviews.bob.go rename to db/dbinfo/raster_overviews.bob.go diff --git a/dbinfo/sessions.bob.go b/db/dbinfo/sessions.bob.go similarity index 100% rename from dbinfo/sessions.bob.go rename to db/dbinfo/sessions.bob.go diff --git a/dbinfo/spatial_ref_sys.bob.go b/db/dbinfo/spatial_ref_sys.bob.go similarity index 100% rename from dbinfo/spatial_ref_sys.bob.go rename to db/dbinfo/spatial_ref_sys.bob.go diff --git a/dbinfo/user_.bob.go b/db/dbinfo/user_.bob.go similarity index 100% rename from dbinfo/user_.bob.go rename to db/dbinfo/user_.bob.go diff --git a/enums/enums.bob.go b/db/enums/enums.bob.go similarity index 100% rename from enums/enums.bob.go rename to db/enums/enums.bob.go diff --git a/factory/bobfactory_context.bob.go b/db/factory/bobfactory_context.bob.go similarity index 100% rename from factory/bobfactory_context.bob.go rename to db/factory/bobfactory_context.bob.go diff --git a/factory/bobfactory_main.bob.go b/db/factory/bobfactory_main.bob.go similarity index 99% rename from factory/bobfactory_main.bob.go rename to db/factory/bobfactory_main.bob.go index d11e3e97..84de0326 100644 --- a/factory/bobfactory_main.bob.go +++ b/db/factory/bobfactory_main.bob.go @@ -7,8 +7,8 @@ import ( "context" "time" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" - models "github.com/Gleipnir-Technology/nidus-sync/models" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/lib/pq" ) diff --git a/factory/bobfactory_main.bob_test.go b/db/factory/bobfactory_main.bob_test.go similarity index 100% rename from factory/bobfactory_main.bob_test.go rename to db/factory/bobfactory_main.bob_test.go diff --git a/factory/bobfactory_random.bob.go b/db/factory/bobfactory_random.bob.go similarity index 98% rename from factory/bobfactory_random.bob.go rename to db/factory/bobfactory_random.bob.go index d00969e2..c7539cef 100644 --- a/factory/bobfactory_random.bob.go +++ b/db/factory/bobfactory_random.bob.go @@ -9,7 +9,7 @@ import ( "strings" "time" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" "github.com/jaswdr/faker/v2" "github.com/lib/pq" ) diff --git a/factory/bobfactory_random.bob_test.go b/db/factory/bobfactory_random.bob_test.go similarity index 100% rename from factory/bobfactory_random.bob_test.go rename to db/factory/bobfactory_random.bob_test.go diff --git a/factory/fieldseeker_sync.bob.go b/db/factory/fieldseeker_sync.bob.go similarity index 99% rename from factory/fieldseeker_sync.bob.go rename to db/factory/fieldseeker_sync.bob.go index a874e5aa..59ed0b02 100644 --- a/factory/fieldseeker_sync.bob.go +++ b/db/factory/fieldseeker_sync.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/omit" "github.com/jaswdr/faker/v2" "github.com/stephenafamo/bob" diff --git a/factory/fs_containerrelate.bob.go b/db/factory/fs_containerrelate.bob.go similarity index 99% rename from factory/fs_containerrelate.bob.go rename to db/factory/fs_containerrelate.bob.go index 46608052..3ab09310 100644 --- a/factory/fs_containerrelate.bob.go +++ b/db/factory/fs_containerrelate.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_fieldscoutinglog.bob.go b/db/factory/fs_fieldscoutinglog.bob.go similarity index 99% rename from factory/fs_fieldscoutinglog.bob.go rename to db/factory/fs_fieldscoutinglog.bob.go index 7f1a30e9..49fda1ed 100644 --- a/factory/fs_fieldscoutinglog.bob.go +++ b/db/factory/fs_fieldscoutinglog.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_habitatrelate.bob.go b/db/factory/fs_habitatrelate.bob.go similarity index 99% rename from factory/fs_habitatrelate.bob.go rename to db/factory/fs_habitatrelate.bob.go index c17ccba8..fce7b80e 100644 --- a/factory/fs_habitatrelate.bob.go +++ b/db/factory/fs_habitatrelate.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_inspectionsample.bob.go b/db/factory/fs_inspectionsample.bob.go similarity index 99% rename from factory/fs_inspectionsample.bob.go rename to db/factory/fs_inspectionsample.bob.go index 21d047ae..65beb7e0 100644 --- a/factory/fs_inspectionsample.bob.go +++ b/db/factory/fs_inspectionsample.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_inspectionsampledetail.bob.go b/db/factory/fs_inspectionsampledetail.bob.go similarity index 99% rename from factory/fs_inspectionsampledetail.bob.go rename to db/factory/fs_inspectionsampledetail.bob.go index fe3c7dd9..255a91f5 100644 --- a/factory/fs_inspectionsampledetail.bob.go +++ b/db/factory/fs_inspectionsampledetail.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_linelocation.bob.go b/db/factory/fs_linelocation.bob.go similarity index 99% rename from factory/fs_linelocation.bob.go rename to db/factory/fs_linelocation.bob.go index 111aa1ea..d736c4a4 100644 --- a/factory/fs_linelocation.bob.go +++ b/db/factory/fs_linelocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_locationtracking.bob.go b/db/factory/fs_locationtracking.bob.go similarity index 99% rename from factory/fs_locationtracking.bob.go rename to db/factory/fs_locationtracking.bob.go index 685539c7..93da331f 100644 --- a/factory/fs_locationtracking.bob.go +++ b/db/factory/fs_locationtracking.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_mosquitoinspection.bob.go b/db/factory/fs_mosquitoinspection.bob.go similarity index 99% rename from factory/fs_mosquitoinspection.bob.go rename to db/factory/fs_mosquitoinspection.bob.go index 0e18a7c0..b2304781 100644 --- a/factory/fs_mosquitoinspection.bob.go +++ b/db/factory/fs_mosquitoinspection.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_pointlocation.bob.go b/db/factory/fs_pointlocation.bob.go similarity index 99% rename from factory/fs_pointlocation.bob.go rename to db/factory/fs_pointlocation.bob.go index 95fe753c..6a1392a5 100644 --- a/factory/fs_pointlocation.bob.go +++ b/db/factory/fs_pointlocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_polygonlocation.bob.go b/db/factory/fs_polygonlocation.bob.go similarity index 99% rename from factory/fs_polygonlocation.bob.go rename to db/factory/fs_polygonlocation.bob.go index 5b4deaa7..f11eeb4d 100644 --- a/factory/fs_polygonlocation.bob.go +++ b/db/factory/fs_polygonlocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_pool.bob.go b/db/factory/fs_pool.bob.go similarity index 99% rename from factory/fs_pool.bob.go rename to db/factory/fs_pool.bob.go index 3080b7ff..be5fc210 100644 --- a/factory/fs_pool.bob.go +++ b/db/factory/fs_pool.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_pooldetail.bob.go b/db/factory/fs_pooldetail.bob.go similarity index 99% rename from factory/fs_pooldetail.bob.go rename to db/factory/fs_pooldetail.bob.go index 3df0f6f7..ce42b13d 100644 --- a/factory/fs_pooldetail.bob.go +++ b/db/factory/fs_pooldetail.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_proposedtreatmentarea.bob.go b/db/factory/fs_proposedtreatmentarea.bob.go similarity index 99% rename from factory/fs_proposedtreatmentarea.bob.go rename to db/factory/fs_proposedtreatmentarea.bob.go index 04d329bc..17b1fb7e 100644 --- a/factory/fs_proposedtreatmentarea.bob.go +++ b/db/factory/fs_proposedtreatmentarea.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_qamosquitoinspection.bob.go b/db/factory/fs_qamosquitoinspection.bob.go similarity index 99% rename from factory/fs_qamosquitoinspection.bob.go rename to db/factory/fs_qamosquitoinspection.bob.go index 334c1efa..6b1c30f0 100644 --- a/factory/fs_qamosquitoinspection.bob.go +++ b/db/factory/fs_qamosquitoinspection.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_rodentlocation.bob.go b/db/factory/fs_rodentlocation.bob.go similarity index 99% rename from factory/fs_rodentlocation.bob.go rename to db/factory/fs_rodentlocation.bob.go index 8dc3e1b6..e8ccfc52 100644 --- a/factory/fs_rodentlocation.bob.go +++ b/db/factory/fs_rodentlocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_samplecollection.bob.go b/db/factory/fs_samplecollection.bob.go similarity index 99% rename from factory/fs_samplecollection.bob.go rename to db/factory/fs_samplecollection.bob.go index 92e6fbce..5c93d9a9 100644 --- a/factory/fs_samplecollection.bob.go +++ b/db/factory/fs_samplecollection.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_samplelocation.bob.go b/db/factory/fs_samplelocation.bob.go similarity index 99% rename from factory/fs_samplelocation.bob.go rename to db/factory/fs_samplelocation.bob.go index 03037287..b8521f85 100644 --- a/factory/fs_samplelocation.bob.go +++ b/db/factory/fs_samplelocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_servicerequest.bob.go b/db/factory/fs_servicerequest.bob.go similarity index 99% rename from factory/fs_servicerequest.bob.go rename to db/factory/fs_servicerequest.bob.go index 0a1002bc..ffbbcc8c 100644 --- a/factory/fs_servicerequest.bob.go +++ b/db/factory/fs_servicerequest.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_speciesabundance.bob.go b/db/factory/fs_speciesabundance.bob.go similarity index 99% rename from factory/fs_speciesabundance.bob.go rename to db/factory/fs_speciesabundance.bob.go index a0b3e9f6..27ac7a94 100644 --- a/factory/fs_speciesabundance.bob.go +++ b/db/factory/fs_speciesabundance.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_stormdrain.bob.go b/db/factory/fs_stormdrain.bob.go similarity index 99% rename from factory/fs_stormdrain.bob.go rename to db/factory/fs_stormdrain.bob.go index 2939e845..8d5f932c 100644 --- a/factory/fs_stormdrain.bob.go +++ b/db/factory/fs_stormdrain.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_timecard.bob.go b/db/factory/fs_timecard.bob.go similarity index 99% rename from factory/fs_timecard.bob.go rename to db/factory/fs_timecard.bob.go index 326e4afd..d974931c 100644 --- a/factory/fs_timecard.bob.go +++ b/db/factory/fs_timecard.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_trapdata.bob.go b/db/factory/fs_trapdata.bob.go similarity index 99% rename from factory/fs_trapdata.bob.go rename to db/factory/fs_trapdata.bob.go index baa9c140..af17fac4 100644 --- a/factory/fs_trapdata.bob.go +++ b/db/factory/fs_trapdata.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_traplocation.bob.go b/db/factory/fs_traplocation.bob.go similarity index 99% rename from factory/fs_traplocation.bob.go rename to db/factory/fs_traplocation.bob.go index c8660984..fec8543b 100644 --- a/factory/fs_traplocation.bob.go +++ b/db/factory/fs_traplocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_treatment.bob.go b/db/factory/fs_treatment.bob.go similarity index 99% rename from factory/fs_treatment.bob.go rename to db/factory/fs_treatment.bob.go index d73fdfce..cf45d62c 100644 --- a/factory/fs_treatment.bob.go +++ b/db/factory/fs_treatment.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_treatmentarea.bob.go b/db/factory/fs_treatmentarea.bob.go similarity index 99% rename from factory/fs_treatmentarea.bob.go rename to db/factory/fs_treatmentarea.bob.go index 7ca571a1..1ad0180d 100644 --- a/factory/fs_treatmentarea.bob.go +++ b/db/factory/fs_treatmentarea.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_zones.bob.go b/db/factory/fs_zones.bob.go similarity index 99% rename from factory/fs_zones.bob.go rename to db/factory/fs_zones.bob.go index abbba866..cea2463e 100644 --- a/factory/fs_zones.bob.go +++ b/db/factory/fs_zones.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/fs_zones2.bob.go b/db/factory/fs_zones2.bob.go similarity index 99% rename from factory/fs_zones2.bob.go rename to db/factory/fs_zones2.bob.go index b5756779..18018c40 100644 --- a/factory/fs_zones2.bob.go +++ b/db/factory/fs_zones2.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/geography_columns.bob.go b/db/factory/geography_columns.bob.go similarity index 99% rename from factory/geography_columns.bob.go rename to db/factory/geography_columns.bob.go index b46312bf..0a8f92aa 100644 --- a/factory/geography_columns.bob.go +++ b/db/factory/geography_columns.bob.go @@ -6,7 +6,7 @@ package factory import ( "context" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/jaswdr/faker/v2" ) diff --git a/factory/geometry_columns.bob.go b/db/factory/geometry_columns.bob.go similarity index 99% rename from factory/geometry_columns.bob.go rename to db/factory/geometry_columns.bob.go index 7afbe148..848ae2af 100644 --- a/factory/geometry_columns.bob.go +++ b/db/factory/geometry_columns.bob.go @@ -6,7 +6,7 @@ package factory import ( "context" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/jaswdr/faker/v2" ) diff --git a/factory/goose_db_version.bob.go b/db/factory/goose_db_version.bob.go similarity index 99% rename from factory/goose_db_version.bob.go rename to db/factory/goose_db_version.bob.go index 27a64162..5d31ebeb 100644 --- a/factory/goose_db_version.bob.go +++ b/db/factory/goose_db_version.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/omit" "github.com/jaswdr/faker/v2" "github.com/stephenafamo/bob" diff --git a/factory/h3_aggregation.bob.go b/db/factory/h3_aggregation.bob.go similarity index 99% rename from factory/h3_aggregation.bob.go rename to db/factory/h3_aggregation.bob.go index c3a29299..83af6873 100644 --- a/factory/h3_aggregation.bob.go +++ b/db/factory/h3_aggregation.bob.go @@ -7,8 +7,8 @@ import ( "context" "testing" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" - models "github.com/Gleipnir-Technology/nidus-sync/models" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_containerrelate.bob.go b/db/factory/history_containerrelate.bob.go similarity index 99% rename from factory/history_containerrelate.bob.go rename to db/factory/history_containerrelate.bob.go index 41b6cd44..e7b7f815 100644 --- a/factory/history_containerrelate.bob.go +++ b/db/factory/history_containerrelate.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_fieldscoutinglog.bob.go b/db/factory/history_fieldscoutinglog.bob.go similarity index 99% rename from factory/history_fieldscoutinglog.bob.go rename to db/factory/history_fieldscoutinglog.bob.go index 887fe39a..a9e1fb78 100644 --- a/factory/history_fieldscoutinglog.bob.go +++ b/db/factory/history_fieldscoutinglog.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_habitatrelate.bob.go b/db/factory/history_habitatrelate.bob.go similarity index 99% rename from factory/history_habitatrelate.bob.go rename to db/factory/history_habitatrelate.bob.go index f8c055e6..b3736ec3 100644 --- a/factory/history_habitatrelate.bob.go +++ b/db/factory/history_habitatrelate.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_inspectionsample.bob.go b/db/factory/history_inspectionsample.bob.go similarity index 99% rename from factory/history_inspectionsample.bob.go rename to db/factory/history_inspectionsample.bob.go index 1b30fca1..0d16eba6 100644 --- a/factory/history_inspectionsample.bob.go +++ b/db/factory/history_inspectionsample.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_inspectionsampledetail.bob.go b/db/factory/history_inspectionsampledetail.bob.go similarity index 99% rename from factory/history_inspectionsampledetail.bob.go rename to db/factory/history_inspectionsampledetail.bob.go index df020016..08959e5e 100644 --- a/factory/history_inspectionsampledetail.bob.go +++ b/db/factory/history_inspectionsampledetail.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_linelocation.bob.go b/db/factory/history_linelocation.bob.go similarity index 99% rename from factory/history_linelocation.bob.go rename to db/factory/history_linelocation.bob.go index 0794a846..ceb26a9f 100644 --- a/factory/history_linelocation.bob.go +++ b/db/factory/history_linelocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_locationtracking.bob.go b/db/factory/history_locationtracking.bob.go similarity index 99% rename from factory/history_locationtracking.bob.go rename to db/factory/history_locationtracking.bob.go index b948af35..ed2b0f9e 100644 --- a/factory/history_locationtracking.bob.go +++ b/db/factory/history_locationtracking.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_mosquitoinspection.bob.go b/db/factory/history_mosquitoinspection.bob.go similarity index 99% rename from factory/history_mosquitoinspection.bob.go rename to db/factory/history_mosquitoinspection.bob.go index c9482796..79cee51d 100644 --- a/factory/history_mosquitoinspection.bob.go +++ b/db/factory/history_mosquitoinspection.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_pointlocation.bob.go b/db/factory/history_pointlocation.bob.go similarity index 99% rename from factory/history_pointlocation.bob.go rename to db/factory/history_pointlocation.bob.go index 14fa6c2c..926f45f8 100644 --- a/factory/history_pointlocation.bob.go +++ b/db/factory/history_pointlocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_polygonlocation.bob.go b/db/factory/history_polygonlocation.bob.go similarity index 99% rename from factory/history_polygonlocation.bob.go rename to db/factory/history_polygonlocation.bob.go index 0b0abe57..c7e50547 100644 --- a/factory/history_polygonlocation.bob.go +++ b/db/factory/history_polygonlocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_pool.bob.go b/db/factory/history_pool.bob.go similarity index 99% rename from factory/history_pool.bob.go rename to db/factory/history_pool.bob.go index a61b9f81..da7802ac 100644 --- a/factory/history_pool.bob.go +++ b/db/factory/history_pool.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_pooldetail.bob.go b/db/factory/history_pooldetail.bob.go similarity index 99% rename from factory/history_pooldetail.bob.go rename to db/factory/history_pooldetail.bob.go index 346b03c2..1828f907 100644 --- a/factory/history_pooldetail.bob.go +++ b/db/factory/history_pooldetail.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_proposedtreatmentarea.bob.go b/db/factory/history_proposedtreatmentarea.bob.go similarity index 99% rename from factory/history_proposedtreatmentarea.bob.go rename to db/factory/history_proposedtreatmentarea.bob.go index 2f9f5693..429f4d56 100644 --- a/factory/history_proposedtreatmentarea.bob.go +++ b/db/factory/history_proposedtreatmentarea.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_qamosquitoinspection.bob.go b/db/factory/history_qamosquitoinspection.bob.go similarity index 99% rename from factory/history_qamosquitoinspection.bob.go rename to db/factory/history_qamosquitoinspection.bob.go index a7c17a67..dd129e60 100644 --- a/factory/history_qamosquitoinspection.bob.go +++ b/db/factory/history_qamosquitoinspection.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_rodentlocation.bob.go b/db/factory/history_rodentlocation.bob.go similarity index 99% rename from factory/history_rodentlocation.bob.go rename to db/factory/history_rodentlocation.bob.go index 996cefc8..7fa1e2c4 100644 --- a/factory/history_rodentlocation.bob.go +++ b/db/factory/history_rodentlocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_samplecollection.bob.go b/db/factory/history_samplecollection.bob.go similarity index 99% rename from factory/history_samplecollection.bob.go rename to db/factory/history_samplecollection.bob.go index 8d00ab86..5a879025 100644 --- a/factory/history_samplecollection.bob.go +++ b/db/factory/history_samplecollection.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_samplelocation.bob.go b/db/factory/history_samplelocation.bob.go similarity index 99% rename from factory/history_samplelocation.bob.go rename to db/factory/history_samplelocation.bob.go index 69c8b330..d730cb42 100644 --- a/factory/history_samplelocation.bob.go +++ b/db/factory/history_samplelocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_servicerequest.bob.go b/db/factory/history_servicerequest.bob.go similarity index 99% rename from factory/history_servicerequest.bob.go rename to db/factory/history_servicerequest.bob.go index 2ce2016f..7d45c2f0 100644 --- a/factory/history_servicerequest.bob.go +++ b/db/factory/history_servicerequest.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_speciesabundance.bob.go b/db/factory/history_speciesabundance.bob.go similarity index 99% rename from factory/history_speciesabundance.bob.go rename to db/factory/history_speciesabundance.bob.go index 0ba449a6..26eebc52 100644 --- a/factory/history_speciesabundance.bob.go +++ b/db/factory/history_speciesabundance.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_stormdrain.bob.go b/db/factory/history_stormdrain.bob.go similarity index 99% rename from factory/history_stormdrain.bob.go rename to db/factory/history_stormdrain.bob.go index 583145e7..446b85f7 100644 --- a/factory/history_stormdrain.bob.go +++ b/db/factory/history_stormdrain.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_timecard.bob.go b/db/factory/history_timecard.bob.go similarity index 99% rename from factory/history_timecard.bob.go rename to db/factory/history_timecard.bob.go index a9409459..40ffb477 100644 --- a/factory/history_timecard.bob.go +++ b/db/factory/history_timecard.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_trapdata.bob.go b/db/factory/history_trapdata.bob.go similarity index 99% rename from factory/history_trapdata.bob.go rename to db/factory/history_trapdata.bob.go index 5f8456f2..aedfac40 100644 --- a/factory/history_trapdata.bob.go +++ b/db/factory/history_trapdata.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_traplocation.bob.go b/db/factory/history_traplocation.bob.go similarity index 99% rename from factory/history_traplocation.bob.go rename to db/factory/history_traplocation.bob.go index e26c8cda..c435ee0a 100644 --- a/factory/history_traplocation.bob.go +++ b/db/factory/history_traplocation.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_treatment.bob.go b/db/factory/history_treatment.bob.go similarity index 99% rename from factory/history_treatment.bob.go rename to db/factory/history_treatment.bob.go index acf4d3c6..150607a1 100644 --- a/factory/history_treatment.bob.go +++ b/db/factory/history_treatment.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_treatmentarea.bob.go b/db/factory/history_treatmentarea.bob.go similarity index 99% rename from factory/history_treatmentarea.bob.go rename to db/factory/history_treatmentarea.bob.go index 0039da17..5ee12e53 100644 --- a/factory/history_treatmentarea.bob.go +++ b/db/factory/history_treatmentarea.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_zones.bob.go b/db/factory/history_zones.bob.go similarity index 99% rename from factory/history_zones.bob.go rename to db/factory/history_zones.bob.go index 7e81b0d6..b566a128 100644 --- a/factory/history_zones.bob.go +++ b/db/factory/history_zones.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/history_zones2.bob.go b/db/factory/history_zones2.bob.go similarity index 99% rename from factory/history_zones2.bob.go rename to db/factory/history_zones2.bob.go index c38fca26..72eab9b2 100644 --- a/factory/history_zones2.bob.go +++ b/db/factory/history_zones2.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/notification.bob.go b/db/factory/notification.bob.go similarity index 99% rename from factory/notification.bob.go rename to db/factory/notification.bob.go index 0b4403ef..acd907cb 100644 --- a/factory/notification.bob.go +++ b/db/factory/notification.bob.go @@ -8,8 +8,8 @@ import ( "testing" "time" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" - models "github.com/Gleipnir-Technology/nidus-sync/models" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/oauth_token.bob.go b/db/factory/oauth_token.bob.go similarity index 99% rename from factory/oauth_token.bob.go rename to db/factory/oauth_token.bob.go index 1d36bf85..2171e405 100644 --- a/factory/oauth_token.bob.go +++ b/db/factory/oauth_token.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/organization.bob.go b/db/factory/organization.bob.go similarity index 99% rename from factory/organization.bob.go rename to db/factory/organization.bob.go index 4dc369da..8bc74d59 100644 --- a/factory/organization.bob.go +++ b/db/factory/organization.bob.go @@ -7,7 +7,7 @@ import ( "context" "testing" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/raster_columns.bob.go b/db/factory/raster_columns.bob.go similarity index 99% rename from factory/raster_columns.bob.go rename to db/factory/raster_columns.bob.go index 777af7e0..ff298896 100644 --- a/factory/raster_columns.bob.go +++ b/db/factory/raster_columns.bob.go @@ -6,7 +6,7 @@ package factory import ( "context" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/jaswdr/faker/v2" "github.com/lib/pq" diff --git a/factory/raster_overviews.bob.go b/db/factory/raster_overviews.bob.go similarity index 99% rename from factory/raster_overviews.bob.go rename to db/factory/raster_overviews.bob.go index 7d9910ea..5cff50dc 100644 --- a/factory/raster_overviews.bob.go +++ b/db/factory/raster_overviews.bob.go @@ -6,7 +6,7 @@ package factory import ( "context" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/jaswdr/faker/v2" ) diff --git a/factory/sessions.bob.go b/db/factory/sessions.bob.go similarity index 99% rename from factory/sessions.bob.go rename to db/factory/sessions.bob.go index ee9fa0fa..9bac8630 100644 --- a/factory/sessions.bob.go +++ b/db/factory/sessions.bob.go @@ -8,7 +8,7 @@ import ( "testing" "time" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/omit" "github.com/jaswdr/faker/v2" "github.com/stephenafamo/bob" diff --git a/factory/spatial_ref_sys.bob.go b/db/factory/spatial_ref_sys.bob.go similarity index 99% rename from factory/spatial_ref_sys.bob.go rename to db/factory/spatial_ref_sys.bob.go index 0b84c401..56c6f496 100644 --- a/factory/spatial_ref_sys.bob.go +++ b/db/factory/spatial_ref_sys.bob.go @@ -7,7 +7,7 @@ import ( "context" "testing" - models "github.com/Gleipnir-Technology/nidus-sync/models" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/factory/user_.bob.go b/db/factory/user_.bob.go similarity index 99% rename from factory/user_.bob.go rename to db/factory/user_.bob.go index 9e3d145f..0d5a3c06 100644 --- a/factory/user_.bob.go +++ b/db/factory/user_.bob.go @@ -8,8 +8,8 @@ import ( "testing" "time" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" - models "github.com/Gleipnir-Technology/nidus-sync/models" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" + models "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/migrations/00001_initial.sql b/db/migrations/00001_initial.sql similarity index 100% rename from migrations/00001_initial.sql rename to db/migrations/00001_initial.sql diff --git a/migrations/00002_password.sql b/db/migrations/00002_password.sql similarity index 100% rename from migrations/00002_password.sql rename to db/migrations/00002_password.sql diff --git a/migrations/00003_add_session.sql b/db/migrations/00003_add_session.sql similarity index 100% rename from migrations/00003_add_session.sql rename to db/migrations/00003_add_session.sql diff --git a/migrations/00004_add_oauth_token.sql b/db/migrations/00004_add_oauth_token.sql similarity index 100% rename from migrations/00004_add_oauth_token.sql rename to db/migrations/00004_add_oauth_token.sql diff --git a/migrations/00005_add_arcgis_org.sql b/db/migrations/00005_add_arcgis_org.sql similarity index 100% rename from migrations/00005_add_arcgis_org.sql rename to db/migrations/00005_add_arcgis_org.sql diff --git a/migrations/00006_add_oauth_refresh_expires.sql b/db/migrations/00006_add_oauth_refresh_expires.sql similarity index 100% rename from migrations/00006_add_oauth_refresh_expires.sql rename to db/migrations/00006_add_oauth_refresh_expires.sql diff --git a/migrations/00007_add_fieldseeker.sql b/db/migrations/00007_add_fieldseeker.sql similarity index 100% rename from migrations/00007_add_fieldseeker.sql rename to db/migrations/00007_add_fieldseeker.sql diff --git a/migrations/00008_add_sync.sql b/db/migrations/00008_add_sync.sql similarity index 100% rename from migrations/00008_add_sync.sql rename to db/migrations/00008_add_sync.sql diff --git a/migrations/00009_add_oauth_invalidated.sql b/db/migrations/00009_add_oauth_invalidated.sql similarity index 100% rename from migrations/00009_add_oauth_invalidated.sql rename to db/migrations/00009_add_oauth_invalidated.sql diff --git a/migrations/00010_add_notification.sql b/db/migrations/00010_add_notification.sql similarity index 100% rename from migrations/00010_add_notification.sql rename to db/migrations/00010_add_notification.sql diff --git a/migrations/00011_fix_fieldseeker.sql b/db/migrations/00011_fix_fieldseeker.sql similarity index 100% rename from migrations/00011_fix_fieldseeker.sql rename to db/migrations/00011_fix_fieldseeker.sql diff --git a/migrations/00012_notification_unique_link.sql b/db/migrations/00012_notification_unique_link.sql similarity index 100% rename from migrations/00012_notification_unique_link.sql rename to db/migrations/00012_notification_unique_link.sql diff --git a/migrations/00013_fs_globalid_not_null.sql b/db/migrations/00013_fs_globalid_not_null.sql similarity index 100% rename from migrations/00013_fs_globalid_not_null.sql rename to db/migrations/00013_fs_globalid_not_null.sql diff --git a/migrations/00014_h3_aggregation.sql b/db/migrations/00014_h3_aggregation.sql similarity index 100% rename from migrations/00014_h3_aggregation.sql rename to db/migrations/00014_h3_aggregation.sql diff --git a/migrations/00015_fs_geometry.sql b/db/migrations/00015_fs_geometry.sql similarity index 100% rename from migrations/00015_fs_geometry.sql rename to db/migrations/00015_fs_geometry.sql diff --git a/models/bob_joins.bob.go b/db/models/bob_joins.bob.go similarity index 100% rename from models/bob_joins.bob.go rename to db/models/bob_joins.bob.go diff --git a/models/bob_loaders.bob.go b/db/models/bob_loaders.bob.go similarity index 100% rename from models/bob_loaders.bob.go rename to db/models/bob_loaders.bob.go diff --git a/models/bob_types.bob_test.go b/db/models/bob_types.bob_test.go similarity index 99% rename from models/bob_types.bob_test.go rename to db/models/bob_types.bob_test.go index 97fc5c43..41ea84d8 100644 --- a/models/bob_types.bob_test.go +++ b/db/models/bob_types.bob_test.go @@ -7,7 +7,7 @@ import ( "database/sql" "database/sql/driver" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" "github.com/lib/pq" "github.com/stephenafamo/bob" ) diff --git a/models/bob_where.bob.go b/db/models/bob_where.bob.go similarity index 100% rename from models/bob_where.bob.go rename to db/models/bob_where.bob.go diff --git a/models/fieldseeker_sync.bob.go b/db/models/fieldseeker_sync.bob.go similarity index 100% rename from models/fieldseeker_sync.bob.go rename to db/models/fieldseeker_sync.bob.go diff --git a/models/fs_containerrelate.bob.go b/db/models/fs_containerrelate.bob.go similarity index 100% rename from models/fs_containerrelate.bob.go rename to db/models/fs_containerrelate.bob.go diff --git a/models/fs_fieldscoutinglog.bob.go b/db/models/fs_fieldscoutinglog.bob.go similarity index 100% rename from models/fs_fieldscoutinglog.bob.go rename to db/models/fs_fieldscoutinglog.bob.go diff --git a/models/fs_habitatrelate.bob.go b/db/models/fs_habitatrelate.bob.go similarity index 100% rename from models/fs_habitatrelate.bob.go rename to db/models/fs_habitatrelate.bob.go diff --git a/models/fs_inspectionsample.bob.go b/db/models/fs_inspectionsample.bob.go similarity index 100% rename from models/fs_inspectionsample.bob.go rename to db/models/fs_inspectionsample.bob.go diff --git a/models/fs_inspectionsampledetail.bob.go b/db/models/fs_inspectionsampledetail.bob.go similarity index 100% rename from models/fs_inspectionsampledetail.bob.go rename to db/models/fs_inspectionsampledetail.bob.go diff --git a/models/fs_linelocation.bob.go b/db/models/fs_linelocation.bob.go similarity index 100% rename from models/fs_linelocation.bob.go rename to db/models/fs_linelocation.bob.go diff --git a/models/fs_locationtracking.bob.go b/db/models/fs_locationtracking.bob.go similarity index 100% rename from models/fs_locationtracking.bob.go rename to db/models/fs_locationtracking.bob.go diff --git a/models/fs_mosquitoinspection.bob.go b/db/models/fs_mosquitoinspection.bob.go similarity index 100% rename from models/fs_mosquitoinspection.bob.go rename to db/models/fs_mosquitoinspection.bob.go diff --git a/models/fs_pointlocation.bob.go b/db/models/fs_pointlocation.bob.go similarity index 100% rename from models/fs_pointlocation.bob.go rename to db/models/fs_pointlocation.bob.go diff --git a/models/fs_polygonlocation.bob.go b/db/models/fs_polygonlocation.bob.go similarity index 100% rename from models/fs_polygonlocation.bob.go rename to db/models/fs_polygonlocation.bob.go diff --git a/models/fs_pool.bob.go b/db/models/fs_pool.bob.go similarity index 100% rename from models/fs_pool.bob.go rename to db/models/fs_pool.bob.go diff --git a/models/fs_pooldetail.bob.go b/db/models/fs_pooldetail.bob.go similarity index 100% rename from models/fs_pooldetail.bob.go rename to db/models/fs_pooldetail.bob.go diff --git a/models/fs_proposedtreatmentarea.bob.go b/db/models/fs_proposedtreatmentarea.bob.go similarity index 100% rename from models/fs_proposedtreatmentarea.bob.go rename to db/models/fs_proposedtreatmentarea.bob.go diff --git a/models/fs_qamosquitoinspection.bob.go b/db/models/fs_qamosquitoinspection.bob.go similarity index 100% rename from models/fs_qamosquitoinspection.bob.go rename to db/models/fs_qamosquitoinspection.bob.go diff --git a/models/fs_rodentlocation.bob.go b/db/models/fs_rodentlocation.bob.go similarity index 100% rename from models/fs_rodentlocation.bob.go rename to db/models/fs_rodentlocation.bob.go diff --git a/models/fs_samplecollection.bob.go b/db/models/fs_samplecollection.bob.go similarity index 100% rename from models/fs_samplecollection.bob.go rename to db/models/fs_samplecollection.bob.go diff --git a/models/fs_samplelocation.bob.go b/db/models/fs_samplelocation.bob.go similarity index 100% rename from models/fs_samplelocation.bob.go rename to db/models/fs_samplelocation.bob.go diff --git a/models/fs_servicerequest.bob.go b/db/models/fs_servicerequest.bob.go similarity index 100% rename from models/fs_servicerequest.bob.go rename to db/models/fs_servicerequest.bob.go diff --git a/models/fs_speciesabundance.bob.go b/db/models/fs_speciesabundance.bob.go similarity index 100% rename from models/fs_speciesabundance.bob.go rename to db/models/fs_speciesabundance.bob.go diff --git a/models/fs_stormdrain.bob.go b/db/models/fs_stormdrain.bob.go similarity index 100% rename from models/fs_stormdrain.bob.go rename to db/models/fs_stormdrain.bob.go diff --git a/models/fs_timecard.bob.go b/db/models/fs_timecard.bob.go similarity index 100% rename from models/fs_timecard.bob.go rename to db/models/fs_timecard.bob.go diff --git a/models/fs_trapdata.bob.go b/db/models/fs_trapdata.bob.go similarity index 100% rename from models/fs_trapdata.bob.go rename to db/models/fs_trapdata.bob.go diff --git a/models/fs_traplocation.bob.go b/db/models/fs_traplocation.bob.go similarity index 100% rename from models/fs_traplocation.bob.go rename to db/models/fs_traplocation.bob.go diff --git a/models/fs_treatment.bob.go b/db/models/fs_treatment.bob.go similarity index 100% rename from models/fs_treatment.bob.go rename to db/models/fs_treatment.bob.go diff --git a/models/fs_treatmentarea.bob.go b/db/models/fs_treatmentarea.bob.go similarity index 100% rename from models/fs_treatmentarea.bob.go rename to db/models/fs_treatmentarea.bob.go diff --git a/models/fs_zones.bob.go b/db/models/fs_zones.bob.go similarity index 100% rename from models/fs_zones.bob.go rename to db/models/fs_zones.bob.go diff --git a/models/fs_zones2.bob.go b/db/models/fs_zones2.bob.go similarity index 100% rename from models/fs_zones2.bob.go rename to db/models/fs_zones2.bob.go diff --git a/models/geography_columns.bob.go b/db/models/geography_columns.bob.go similarity index 100% rename from models/geography_columns.bob.go rename to db/models/geography_columns.bob.go diff --git a/models/geometry_columns.bob.go b/db/models/geometry_columns.bob.go similarity index 100% rename from models/geometry_columns.bob.go rename to db/models/geometry_columns.bob.go diff --git a/models/goose_db_version.bob.go b/db/models/goose_db_version.bob.go similarity index 100% rename from models/goose_db_version.bob.go rename to db/models/goose_db_version.bob.go diff --git a/models/h3_aggregation.bob.go b/db/models/h3_aggregation.bob.go similarity index 99% rename from models/h3_aggregation.bob.go rename to db/models/h3_aggregation.bob.go index 64d90800..8555fb4e 100644 --- a/models/h3_aggregation.bob.go +++ b/db/models/h3_aggregation.bob.go @@ -8,7 +8,7 @@ import ( "fmt" "io" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/models/history_containerrelate.bob.go b/db/models/history_containerrelate.bob.go similarity index 100% rename from models/history_containerrelate.bob.go rename to db/models/history_containerrelate.bob.go diff --git a/models/history_fieldscoutinglog.bob.go b/db/models/history_fieldscoutinglog.bob.go similarity index 100% rename from models/history_fieldscoutinglog.bob.go rename to db/models/history_fieldscoutinglog.bob.go diff --git a/models/history_habitatrelate.bob.go b/db/models/history_habitatrelate.bob.go similarity index 100% rename from models/history_habitatrelate.bob.go rename to db/models/history_habitatrelate.bob.go diff --git a/models/history_inspectionsample.bob.go b/db/models/history_inspectionsample.bob.go similarity index 100% rename from models/history_inspectionsample.bob.go rename to db/models/history_inspectionsample.bob.go diff --git a/models/history_inspectionsampledetail.bob.go b/db/models/history_inspectionsampledetail.bob.go similarity index 100% rename from models/history_inspectionsampledetail.bob.go rename to db/models/history_inspectionsampledetail.bob.go diff --git a/models/history_linelocation.bob.go b/db/models/history_linelocation.bob.go similarity index 100% rename from models/history_linelocation.bob.go rename to db/models/history_linelocation.bob.go diff --git a/models/history_locationtracking.bob.go b/db/models/history_locationtracking.bob.go similarity index 100% rename from models/history_locationtracking.bob.go rename to db/models/history_locationtracking.bob.go diff --git a/models/history_mosquitoinspection.bob.go b/db/models/history_mosquitoinspection.bob.go similarity index 100% rename from models/history_mosquitoinspection.bob.go rename to db/models/history_mosquitoinspection.bob.go diff --git a/models/history_pointlocation.bob.go b/db/models/history_pointlocation.bob.go similarity index 100% rename from models/history_pointlocation.bob.go rename to db/models/history_pointlocation.bob.go diff --git a/models/history_polygonlocation.bob.go b/db/models/history_polygonlocation.bob.go similarity index 100% rename from models/history_polygonlocation.bob.go rename to db/models/history_polygonlocation.bob.go diff --git a/models/history_pool.bob.go b/db/models/history_pool.bob.go similarity index 100% rename from models/history_pool.bob.go rename to db/models/history_pool.bob.go diff --git a/models/history_pooldetail.bob.go b/db/models/history_pooldetail.bob.go similarity index 100% rename from models/history_pooldetail.bob.go rename to db/models/history_pooldetail.bob.go diff --git a/models/history_proposedtreatmentarea.bob.go b/db/models/history_proposedtreatmentarea.bob.go similarity index 100% rename from models/history_proposedtreatmentarea.bob.go rename to db/models/history_proposedtreatmentarea.bob.go diff --git a/models/history_qamosquitoinspection.bob.go b/db/models/history_qamosquitoinspection.bob.go similarity index 100% rename from models/history_qamosquitoinspection.bob.go rename to db/models/history_qamosquitoinspection.bob.go diff --git a/models/history_rodentlocation.bob.go b/db/models/history_rodentlocation.bob.go similarity index 100% rename from models/history_rodentlocation.bob.go rename to db/models/history_rodentlocation.bob.go diff --git a/models/history_samplecollection.bob.go b/db/models/history_samplecollection.bob.go similarity index 100% rename from models/history_samplecollection.bob.go rename to db/models/history_samplecollection.bob.go diff --git a/models/history_samplelocation.bob.go b/db/models/history_samplelocation.bob.go similarity index 100% rename from models/history_samplelocation.bob.go rename to db/models/history_samplelocation.bob.go diff --git a/models/history_servicerequest.bob.go b/db/models/history_servicerequest.bob.go similarity index 100% rename from models/history_servicerequest.bob.go rename to db/models/history_servicerequest.bob.go diff --git a/models/history_speciesabundance.bob.go b/db/models/history_speciesabundance.bob.go similarity index 100% rename from models/history_speciesabundance.bob.go rename to db/models/history_speciesabundance.bob.go diff --git a/models/history_stormdrain.bob.go b/db/models/history_stormdrain.bob.go similarity index 100% rename from models/history_stormdrain.bob.go rename to db/models/history_stormdrain.bob.go diff --git a/models/history_timecard.bob.go b/db/models/history_timecard.bob.go similarity index 100% rename from models/history_timecard.bob.go rename to db/models/history_timecard.bob.go diff --git a/models/history_trapdata.bob.go b/db/models/history_trapdata.bob.go similarity index 100% rename from models/history_trapdata.bob.go rename to db/models/history_trapdata.bob.go diff --git a/models/history_traplocation.bob.go b/db/models/history_traplocation.bob.go similarity index 100% rename from models/history_traplocation.bob.go rename to db/models/history_traplocation.bob.go diff --git a/models/history_treatment.bob.go b/db/models/history_treatment.bob.go similarity index 100% rename from models/history_treatment.bob.go rename to db/models/history_treatment.bob.go diff --git a/models/history_treatmentarea.bob.go b/db/models/history_treatmentarea.bob.go similarity index 100% rename from models/history_treatmentarea.bob.go rename to db/models/history_treatmentarea.bob.go diff --git a/models/history_zones.bob.go b/db/models/history_zones.bob.go similarity index 100% rename from models/history_zones.bob.go rename to db/models/history_zones.bob.go diff --git a/models/history_zones2.bob.go b/db/models/history_zones2.bob.go similarity index 100% rename from models/history_zones2.bob.go rename to db/models/history_zones2.bob.go diff --git a/models/notification.bob.go b/db/models/notification.bob.go similarity index 99% rename from models/notification.bob.go rename to db/models/notification.bob.go index 47ff1199..77038401 100644 --- a/models/notification.bob.go +++ b/db/models/notification.bob.go @@ -9,7 +9,7 @@ import ( "io" "time" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/models/oauth_token.bob.go b/db/models/oauth_token.bob.go similarity index 100% rename from models/oauth_token.bob.go rename to db/models/oauth_token.bob.go diff --git a/models/organization.bob.go b/db/models/organization.bob.go similarity index 100% rename from models/organization.bob.go rename to db/models/organization.bob.go diff --git a/models/raster_columns.bob.go b/db/models/raster_columns.bob.go similarity index 100% rename from models/raster_columns.bob.go rename to db/models/raster_columns.bob.go diff --git a/models/raster_overviews.bob.go b/db/models/raster_overviews.bob.go similarity index 100% rename from models/raster_overviews.bob.go rename to db/models/raster_overviews.bob.go diff --git a/models/sessions.bob.go b/db/models/sessions.bob.go similarity index 100% rename from models/sessions.bob.go rename to db/models/sessions.bob.go diff --git a/models/spatial_ref_sys.bob.go b/db/models/spatial_ref_sys.bob.go similarity index 100% rename from models/spatial_ref_sys.bob.go rename to db/models/spatial_ref_sys.bob.go diff --git a/models/user_.bob.go b/db/models/user_.bob.go similarity index 99% rename from models/user_.bob.go rename to db/models/user_.bob.go index b7c64258..65fb33e7 100644 --- a/models/user_.bob.go +++ b/db/models/user_.bob.go @@ -9,7 +9,7 @@ import ( "io" "time" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" diff --git a/sql/oauth_by_user_id.bob.go b/db/sql/oauth_by_user_id.bob.go similarity index 100% rename from sql/oauth_by_user_id.bob.go rename to db/sql/oauth_by_user_id.bob.go diff --git a/sql/oauth_by_user_id.bob.sql b/db/sql/oauth_by_user_id.bob.sql similarity index 100% rename from sql/oauth_by_user_id.bob.sql rename to db/sql/oauth_by_user_id.bob.sql diff --git a/sql/oauth_by_user_id.bob_test.go b/db/sql/oauth_by_user_id.bob_test.go similarity index 100% rename from sql/oauth_by_user_id.bob_test.go rename to db/sql/oauth_by_user_id.bob_test.go diff --git a/sql/oauth_by_user_id.sql b/db/sql/oauth_by_user_id.sql similarity index 100% rename from sql/oauth_by_user_id.sql rename to db/sql/oauth_by_user_id.sql diff --git a/sql/org_by_oauth_id.bob.go b/db/sql/org_by_oauth_id.bob.go similarity index 100% rename from sql/org_by_oauth_id.bob.go rename to db/sql/org_by_oauth_id.bob.go diff --git a/sql/org_by_oauth_id.bob.sql b/db/sql/org_by_oauth_id.bob.sql similarity index 100% rename from sql/org_by_oauth_id.bob.sql rename to db/sql/org_by_oauth_id.bob.sql diff --git a/sql/org_by_oauth_id.bob_test.go b/db/sql/org_by_oauth_id.bob_test.go similarity index 100% rename from sql/org_by_oauth_id.bob_test.go rename to db/sql/org_by_oauth_id.bob_test.go diff --git a/sql/org_by_oauth_id.sql b/db/sql/org_by_oauth_id.sql similarity index 100% rename from sql/org_by_oauth_id.sql rename to db/sql/org_by_oauth_id.sql diff --git a/sql/test_utils.bob_test.go b/db/sql/test_utils.bob_test.go similarity index 97% rename from sql/test_utils.bob_test.go rename to db/sql/test_utils.bob_test.go index 4d5aa6c0..dde0c269 100644 --- a/sql/test_utils.bob_test.go +++ b/db/sql/test_utils.bob_test.go @@ -8,7 +8,7 @@ import ( "strings" "time" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" "github.com/jaswdr/faker/v2" "github.com/shopspring/decimal" "github.com/stephenafamo/bob" diff --git a/sql/trapcount_by_location_id.bob.go b/db/sql/trapcount_by_location_id.bob.go similarity index 100% rename from sql/trapcount_by_location_id.bob.go rename to db/sql/trapcount_by_location_id.bob.go diff --git a/sql/trapcount_by_location_id.bob.sql b/db/sql/trapcount_by_location_id.bob.sql similarity index 100% rename from sql/trapcount_by_location_id.bob.sql rename to db/sql/trapcount_by_location_id.bob.sql diff --git a/sql/trapcount_by_location_id.bob_test.go b/db/sql/trapcount_by_location_id.bob_test.go similarity index 100% rename from sql/trapcount_by_location_id.bob_test.go rename to db/sql/trapcount_by_location_id.bob_test.go diff --git a/sql/trapcount_by_location_id.sql b/db/sql/trapcount_by_location_id.sql similarity index 100% rename from sql/trapcount_by_location_id.sql rename to db/sql/trapcount_by_location_id.sql diff --git a/sql/trapdata_by_location_id_recent.bob.go b/db/sql/trapdata_by_location_id_recent.bob.go similarity index 100% rename from sql/trapdata_by_location_id_recent.bob.go rename to db/sql/trapdata_by_location_id_recent.bob.go diff --git a/sql/trapdata_by_location_id_recent.bob.sql b/db/sql/trapdata_by_location_id_recent.bob.sql similarity index 100% rename from sql/trapdata_by_location_id_recent.bob.sql rename to db/sql/trapdata_by_location_id_recent.bob.sql diff --git a/sql/trapdata_by_location_id_recent.bob_test.go b/db/sql/trapdata_by_location_id_recent.bob_test.go similarity index 100% rename from sql/trapdata_by_location_id_recent.bob_test.go rename to db/sql/trapdata_by_location_id_recent.bob_test.go diff --git a/sql/trapdata_by_location_id_recent.sql b/db/sql/trapdata_by_location_id_recent.sql similarity index 100% rename from sql/trapdata_by_location_id_recent.sql rename to db/sql/trapdata_by_location_id_recent.sql diff --git a/sql/traplocation_by_source_id.bob.go b/db/sql/traplocation_by_source_id.bob.go similarity index 100% rename from sql/traplocation_by_source_id.bob.go rename to db/sql/traplocation_by_source_id.bob.go diff --git a/sql/traplocation_by_source_id.bob.sql b/db/sql/traplocation_by_source_id.bob.sql similarity index 100% rename from sql/traplocation_by_source_id.bob.sql rename to db/sql/traplocation_by_source_id.bob.sql diff --git a/sql/traplocation_by_source_id.bob_test.go b/db/sql/traplocation_by_source_id.bob_test.go similarity index 100% rename from sql/traplocation_by_source_id.bob_test.go rename to db/sql/traplocation_by_source_id.bob_test.go diff --git a/sql/traplocation_by_source_id.sql b/db/sql/traplocation_by_source_id.sql similarity index 100% rename from sql/traplocation_by_source_id.sql rename to db/sql/traplocation_by_source_id.sql diff --git a/sql/update_oauth_org.bob.go b/db/sql/update_oauth_org.bob.go similarity index 100% rename from sql/update_oauth_org.bob.go rename to db/sql/update_oauth_org.bob.go diff --git a/sql/update_oauth_org.bob.sql b/db/sql/update_oauth_org.bob.sql similarity index 100% rename from sql/update_oauth_org.bob.sql rename to db/sql/update_oauth_org.bob.sql diff --git a/sql/update_oauth_org.bob_test.go b/db/sql/update_oauth_org.bob_test.go similarity index 100% rename from sql/update_oauth_org.bob_test.go rename to db/sql/update_oauth_org.bob_test.go diff --git a/sql/update_oauth_org.sql b/db/sql/update_oauth_org.sql similarity index 100% rename from sql/update_oauth_org.sql rename to db/sql/update_oauth_org.sql diff --git a/sql/user_by_username.bob.go b/db/sql/user_by_username.bob.go similarity index 98% rename from sql/user_by_username.bob.go rename to db/sql/user_by_username.bob.go index f2221afc..e2a40143 100644 --- a/sql/user_by_username.bob.go +++ b/db/sql/user_by_username.bob.go @@ -10,7 +10,7 @@ import ( "iter" "time" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" "github.com/aarondl/opt/null" "github.com/stephenafamo/bob" "github.com/stephenafamo/bob/dialect/psql" diff --git a/sql/user_by_username.bob.sql b/db/sql/user_by_username.bob.sql similarity index 100% rename from sql/user_by_username.bob.sql rename to db/sql/user_by_username.bob.sql diff --git a/sql/user_by_username.bob_test.go b/db/sql/user_by_username.bob_test.go similarity index 100% rename from sql/user_by_username.bob_test.go rename to db/sql/user_by_username.bob_test.go diff --git a/sql/user_by_username.sql b/db/sql/user_by_username.sql similarity index 100% rename from sql/user_by_username.sql rename to db/sql/user_by_username.sql diff --git a/endpoint.go b/endpoint.go index ef32c882..4b8e0cca 100644 --- a/endpoint.go +++ b/endpoint.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/Gleipnir-Technology/nidus-sync/models" + "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/go-chi/chi/v5" "github.com/rs/zerolog/log" "github.com/skip2/go-qrcode" diff --git a/html.go b/html.go index b226b06b..3be7c400 100644 --- a/html.go +++ b/html.go @@ -16,8 +16,9 @@ import ( "strings" "time" - "github.com/Gleipnir-Technology/nidus-sync/models" - "github.com/Gleipnir-Technology/nidus-sync/sql" + "github.com/Gleipnir-Technology/nidus-sync/db" + "github.com/Gleipnir-Technology/nidus-sync/db/models" + "github.com/Gleipnir-Technology/nidus-sync/db/sql" "github.com/aarondl/opt/null" "github.com/rs/zerolog/log" "github.com/stephenafamo/bob" @@ -215,7 +216,7 @@ func extractInitials(name string) string { } func htmlCell(ctx context.Context, w http.ResponseWriter, user *models.User, c int64) { - org, err := user.Organization().One(ctx, PGInstance.BobDB) + org, err := user.Organization().One(ctx, db.PGInstance.BobDB) if err != nil { respondError(w, "Failed to get org", err, http.StatusInternalServerError) return @@ -276,13 +277,13 @@ func htmlCell(ctx context.Context, w http.ResponseWriter, user *models.User, c i } func htmlDashboard(ctx context.Context, w http.ResponseWriter, user *models.User) { - org, err := user.Organization().One(ctx, PGInstance.BobDB) + org, err := user.Organization().One(ctx, db.PGInstance.BobDB) if err != nil { respondError(w, "Failed to get org", err, http.StatusInternalServerError) return } var lastSync *time.Time - sync, err := org.FieldseekerSyncs(sm.OrderBy("created").Desc()).One(ctx, PGInstance.BobDB) + sync, err := org.FieldseekerSyncs(sm.OrderBy("created").Desc()).One(ctx, db.PGInstance.BobDB) if err != nil { if err.Error() != "sql: no rows in result set" { respondError(w, "Failed to get syncs", err, http.StatusInternalServerError) @@ -291,22 +292,22 @@ func htmlDashboard(ctx context.Context, w http.ResponseWriter, user *models.User } else { lastSync = &sync.Created } - inspectionCount, err := org.FSMosquitoinspections().Count(ctx, PGInstance.BobDB) + inspectionCount, err := org.FSMosquitoinspections().Count(ctx, db.PGInstance.BobDB) if err != nil { respondError(w, "Failed to get inspection count", err, http.StatusInternalServerError) return } - sourceCount, err := org.FSPointlocations().Count(ctx, PGInstance.BobDB) + sourceCount, err := org.FSPointlocations().Count(ctx, db.PGInstance.BobDB) if err != nil { respondError(w, "Failed to get source count", err, http.StatusInternalServerError) return } - serviceCount, err := org.FSServicerequests().Count(ctx, PGInstance.BobDB) + serviceCount, err := org.FSServicerequests().Count(ctx, db.PGInstance.BobDB) if err != nil { respondError(w, "Failed to get service count", err, http.StatusInternalServerError) return } - recentRequests, err := org.FSServicerequests(sm.OrderBy("creationdate").Desc(), sm.Limit(10)).All(ctx, PGInstance.BobDB) + recentRequests, err := org.FSServicerequests(sm.OrderBy("creationdate").Desc(), sm.Limit(10)).All(ctx, db.PGInstance.BobDB) if err != nil { respondError(w, "Failed to get recent service", err, http.StatusInternalServerError) return @@ -337,10 +338,11 @@ func htmlDashboard(ctx context.Context, w http.ResponseWriter, user *models.User } func htmlOauthPrompt(w http.ResponseWriter, user *models.User) { + dp := user.DisplayName data := ContentDashboard{ User: User{ - DisplayName: user.DisplayName, - Initials: extractInitials(user.DisplayName), + DisplayName: dp, + Initials: extractInitials(dp), Username: user.Username, }, } @@ -476,7 +478,7 @@ func htmlSignup(w http.ResponseWriter, path string) { } func htmlSource(w http.ResponseWriter, r *http.Request, user *models.User, id string) { - org, err := user.Organization().One(r.Context(), PGInstance.BobDB) + org, err := user.Organization().One(r.Context(), db.PGInstance.BobDB) if err != nil { respondError(w, "Failed to get org", err, http.StatusInternalServerError) return @@ -769,7 +771,7 @@ func timeSince(t *time.Time) string { } func trapsBySource(ctx context.Context, org *models.Organization, sourceID string) ([]TrapNearby, error) { - locations, err := sql.TrapLocationBySourceID(org.ID, sourceID).All(ctx, PGInstance.BobDB) + locations, err := sql.TrapLocationBySourceID(org.ID, sourceID).All(ctx, db.PGInstance.BobDB) if err != nil { return nil, fmt.Errorf("Failed to query rows: %w", err) } @@ -786,7 +788,7 @@ func trapsBySource(ctx context.Context, org *models.Organization, sourceID strin models.FSTrapdata.Columns.LocID.In(args...), ), sm.OrderBy("enddatetime"), - ).All(ctx, PGInstance.BobDB) + ).All(ctx, db.PGInstance.BobDB) */ /* @@ -827,15 +829,15 @@ func trapsBySource(ctx context.Context, org *models.Organization, sourceID strin sm.OrderBy(models.FSTrapdata.Columns.Enddatetime).Desc(), ) log.Info().Str("trapdata", queryToString(query)).Msg("Getting trap data") - trap_data, err := query.Exec(ctx, PGInstance.BobDB) + trap_data, err := query.Exec(ctx, db.PGInstance.BobDB) */ - trap_data, err := sql.TrapDataByLocationIDRecent(org.ID, location_ids).All(ctx, PGInstance.BobDB) + trap_data, err := sql.TrapDataByLocationIDRecent(org.ID, location_ids).All(ctx, db.PGInstance.BobDB) if err != nil { return nil, fmt.Errorf("Failed to query trap data: %w", err) } - counts, err := sql.TrapCountByLocationID(org.ID, location_ids).All(ctx, PGInstance.BobDB) + counts, err := sql.TrapCountByLocationID(org.ID, location_ids).All(ctx, db.PGInstance.BobDB) if err != nil { return nil, fmt.Errorf("Failed to query trap counts: %w", err) } @@ -865,7 +867,7 @@ func treatmentsBySource(ctx context.Context, org *models.Organization, sourceID models.FSTreatments.Columns.Pointlocid.EQ(psql.Arg(sourceID)), ), sm.OrderBy("enddatetime").Desc(), - ).All(ctx, PGInstance.BobDB) + ).All(ctx, db.PGInstance.BobDB) if err != nil { return results, fmt.Errorf("Failed to query rows: %w", err) } @@ -886,7 +888,7 @@ func treatmentsByCell(ctx context.Context, org *models.Organization, c h3.Cell) ), sm.OrderBy("pointlocid"), sm.OrderBy("enddatetime"), - ).All(ctx, PGInstance.BobDB) + ).All(ctx, db.PGInstance.BobDB) if err != nil { return results, fmt.Errorf("Failed to query rows: %w", err) } @@ -906,7 +908,7 @@ func inspectionsByCell(ctx context.Context, org *models.Organization, c h3.Cell) ), sm.OrderBy("pointlocid"), sm.OrderBy("enddatetime"), - ).All(ctx, PGInstance.BobDB) + ).All(ctx, db.PGInstance.BobDB) if err != nil { return results, fmt.Errorf("Failed to query rows: %w", err) } @@ -920,7 +922,7 @@ func inspectionsBySource(ctx context.Context, org *models.Organization, sourceID models.FSMosquitoinspections.Columns.Pointlocid.EQ(psql.Arg(sourceID)), ), sm.OrderBy("enddatetime").Desc(), - ).All(ctx, PGInstance.BobDB) + ).All(ctx, db.PGInstance.BobDB) if err != nil { return results, fmt.Errorf("Failed to query rows: %w", err) } @@ -939,7 +941,7 @@ func breedingSourcesByCell(ctx context.Context, org *models.Organization, c h3.C psql.F("ST_Within", "geom", geom_query), ), sm.OrderBy("lasttreatdate"), - ).All(ctx, PGInstance.BobDB) + ).All(ctx, db.PGInstance.BobDB) if err != nil { return results, fmt.Errorf("Failed to query rows: %w", err) } @@ -965,7 +967,7 @@ func uuidShort(uuid string) string { func sourceByGlobalId(ctx context.Context, org *models.Organization, id string) (*BreedingSourceDetail, error) { row, err := org.FSPointlocations( sm.Where(models.FSPointlocations.Columns.Globalid.EQ(psql.Arg(id))), - ).One(ctx, PGInstance.BobDB) + ).One(ctx, db.PGInstance.BobDB) if err != nil { return nil, fmt.Errorf("Failed to get point location: %w", err) } diff --git a/main.go b/main.go index adf3970b..68f1c293 100644 --- a/main.go +++ b/main.go @@ -9,6 +9,7 @@ import ( "syscall" "time" + "github.com/Gleipnir-Technology/nidus-sync/db" "github.com/alexedwards/scs/pgxstore" "github.com/alexedwards/scs/v2" "github.com/go-chi/chi/v5" @@ -65,13 +66,13 @@ func main() { } log.Info().Msg("Starting...") - err := initializeDatabase(context.TODO(), pg_dsn) + err := db.InitializeDatabase(context.TODO(), pg_dsn) if err != nil { log.Error().Str("err", err.Error()).Msg("Failed to connect to database") os.Exit(2) } sessionManager = scs.New() - sessionManager.Store = pgxstore.New(PGInstance.PGXPool) + sessionManager.Store = pgxstore.New(db.PGInstance.PGXPool) sessionManager.Lifetime = 24 * time.Hour r := chi.NewRouter() diff --git a/model_conversion.go b/model_conversion.go index 0d6a4251..db5baddc 100644 --- a/model_conversion.go +++ b/model_conversion.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/Gleipnir-Technology/nidus-sync/models" - "github.com/Gleipnir-Technology/nidus-sync/sql" + "github.com/Gleipnir-Technology/nidus-sync/db/models" + "github.com/Gleipnir-Technology/nidus-sync/db/sql" "github.com/aarondl/opt/null" "github.com/uber/h3-go/v4" ) diff --git a/notification.go b/notification.go index f677bc91..9744e6d4 100644 --- a/notification.go +++ b/notification.go @@ -6,8 +6,9 @@ import ( "log/slog" "time" - enums "github.com/Gleipnir-Technology/nidus-sync/enums" - "github.com/Gleipnir-Technology/nidus-sync/models" + "github.com/Gleipnir-Technology/nidus-sync/db" + enums "github.com/Gleipnir-Technology/nidus-sync/db/enums" + "github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" ) @@ -34,7 +35,7 @@ func clearNotificationsOauth(ctx context.Context, user *models.User) { models.UpdateWhere.Notifications.UserID.EQ(user.ID), setter.UpdateMod(), ) - updater.Exec(ctx, PGInstance.BobDB) + updater.Exec(ctx, db.PGInstance.BobDB) //user.UserNotifications( //models.SelectWhere.Notifications.Link.EQ(NotificationPathOauthReset), //).UpdateAll() @@ -47,7 +48,7 @@ func notifyOauthInvalid(ctx context.Context, user *models.User) { Link: omit.From(NotificationPathOauthReset), Type: omit.From(enums.NotificationtypeOauthTokenInvalidated), } - err := user.InsertUserNotifications(ctx, PGInstance.BobDB, ¬ificationSetter) + err := user.InsertUserNotifications(ctx, db.PGInstance.BobDB, ¬ificationSetter) if err != nil { LogErrorTypeInfo(err) slog.Error("Failed to insert new notification. Update this clause to detect duplicate inserts.", slog.String("err", err.Error())) @@ -59,7 +60,7 @@ func notificationsForUser(ctx context.Context, u *models.User) ([]Notification, results := make([]Notification, 0) notifications, err := u.UserNotifications( models.SelectWhere.Notifications.ResolvedAt.IsNull(), - ).All(ctx, PGInstance.BobDB) + ).All(ctx, db.PGInstance.BobDB) if err != nil { return results, fmt.Errorf("Failed to get notifications: %w", err) }