Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rework arcgis integration for arcgis-go changes and table changes

Browse source
This commit is contained in:
Eli Ribble 2026-02-28 23:26:08 +00:00
parent f19fb0ef2a
commit d4d9749431
No known key found for this signature in database
5 changed files with 903 additions and 795 deletions
Download patch file Download diff file Expand all files Collapse all files

1547
background/arcgis.go
View file

File diff suppressed because it is too large Load diff

29
db/fieldseeker.go
View file

@ -1,5 +1,6 @@
package db
/*
import (
"context"
"fmt"
@ -19,43 +20,35 @@ import (
func SaveOrUpdateAerialSpraySession(ctx context.Context, org *models.Organization, fs []*fslayer.AerialSpraySession) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring AerialSpraySession data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "AerialSpraySession", "fieldseeker.insert_aerialspraysession", func(row *fslayer.AerialSpraySession) ([]SqlParam, error) {
return []SqlParam{
//Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateAerialSprayLine(ctx context.Context, org *models.Organization, fs []*fslayer.AerialSprayLine) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring AerialSprayLine data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "AerialSprayLine", "fieldseeker.insert_aerialsprayline", func(row *fslayer.AerialSprayLine) ([]SqlParam, error) {
return []SqlParam{
}, nil
})
*/
}
func SaveOrUpdateBarrierSpray(ctx context.Context, org *models.Organization, fs []*fslayer.BarrierSpray) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring BarrierSpray data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "BarrierSpray", "fieldseeker.insert_barrierspray", func(row *fslayer.BarrierSpray) ([]SqlParam, error) {
return []SqlParam{
}, nil
})
*/
}
func SaveOrUpdateBarrierSprayRoute(ctx context.Context, org *models.Organization, fs []*fslayer.BarrierSprayRoute) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring BarrierSprayRoute data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "BarrierSprayRoute", "fieldseeker.insert_barriersprayroute", func(row *fslayer.BarrierSprayRoute) ([]SqlParam, error) {
return []SqlParam{
}, nil
})
*/
}
func SaveOrUpdateContainerRelate(ctx context.Context, org *models.Organization, fs []*fslayer.ContainerRelate) (inserts uint, updates uint, err error) {
return doUpdatesViaFunction(ctx, org, fs, "ContainerRelate", "fieldseeker.insert_containerrelate", func(row *fslayer.ContainerRelate) ([]SqlParam, error) {
@ -205,24 +198,20 @@ func SaveOrUpdateInspectionSampleDetail(ctx context.Context, org *models.Organiz
func SaveOrUpdateLandingCount(ctx context.Context, org *models.Organization, fs []*fslayer.LandingCount) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring LandingCount data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "LandingCount", "fieldseeker.insert_landingcount", func(row *fslayer.LandingCount) ([]SqlParam, error) {
return []SqlParam{
Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateLandingCountLocation(ctx context.Context, org *models.Organization, fs []*fslayer.LandingCountLocation) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring LandingCountLocation data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "LandingCountLocation", "fieldseeker.insert_landingcountlocation", func(row *fslayer.LandingCountLocation) ([]SqlParam, error) {
return []SqlParam{
Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateLineLocation(ctx context.Context, org *models.Organization, fs []*fslayer.LineLocation) (inserts uint, updates uint, err error) {
return doUpdatesViaFunction(ctx, org, fs, "LineLocation", "fieldseeker.insert_linelocation", func(row *fslayer.LineLocation) ([]SqlParam, error) {
@ -385,13 +374,11 @@ func SaveOrUpdateMosquitoInspection(ctx context.Context, org *models.Organizatio
func SaveOrUpdateOfflineMapAreas(ctx context.Context, org *models.Organization, fs []*fslayer.OfflineMapAreas) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring OfflineMapAreas data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "OfflineMapAreas", "fieldseeker.insert_offlinemapareas", func(row *fslayer.OfflineMapAreas) ([]SqlParam, error) {
return []SqlParam{
Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateProposedTreatmentArea(ctx context.Context, org *models.Organization, fs []*fslayer.ProposedTreatmentArea) (inserts uint, updates uint, err error) {
return doUpdatesViaFunction(ctx, org, fs, "ProposedTreatmentArea", "fieldseeker.insert_proposedtreatmentarea", func(row *fslayer.ProposedTreatmentArea) ([]SqlParam, error) {
@ -632,24 +619,20 @@ func SaveOrUpdatePool(ctx context.Context, org *models.Organization, fs []*fslay
func SaveOrUpdatePoolBuffer(ctx context.Context, org *models.Organization, fs []*fslayer.PoolBuffer) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring PoolBuffer data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "PoolBuffer", "fieldseeker.insert_poolbuffer", func(row *fslayer.PoolBuffer) ([]SqlParam, error) {
return []SqlParam{
Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateQALarvCount(ctx context.Context, org *models.Organization, fs []*fslayer.QALarvCount) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring QALarvCount data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "QALarvCount", "fieldseeker.insert_qalarvcount", func(row *fslayer.QALarvCount) ([]SqlParam, error) {
return []SqlParam{
Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateQAMosquitoInspection(ctx context.Context, org *models.Organization, fs []*fslayer.QAMosquitoInspection) (inserts uint, updates uint, err error) {
return doUpdatesViaFunction(ctx, org, fs, "QAMosquitoInspection", "fieldseeker.insert_qamosquitoinspection", func(row *fslayer.QAMosquitoInspection) ([]SqlParam, error) {
@ -730,24 +713,20 @@ func SaveOrUpdateQAMosquitoInspection(ctx context.Context, org *models.Organizat
func SaveOrUpdateQAProductObservation(ctx context.Context, org *models.Organization, fs []*fslayer.QAProductObservation) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring QAProductObservation data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "QAProductObservation", "fieldseeker.insert_qaproductobservation", func(row *fslayer.QAProductObservation) ([]SqlParam, error) {
return []SqlParam{
Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateRestrictedArea(ctx context.Context, org *models.Organization, fs []*fslayer.RestrictedArea) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring RestrictedArea data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "RestrictedArea", "fieldseeker.insert_restrictedarea", func(row *fslayer.RestrictedArea) ([]SqlParam, error) {
return []SqlParam{
Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateRodentInspection(ctx context.Context, org *models.Organization, fs []*fslayer.RodentInspection) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring RodentInspection data")
@ -758,7 +737,6 @@ func SaveOrUpdateRodentInspection(ctx context.Context, org *models.Organization,
Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateRodentLocation(ctx context.Context, org *models.Organization, fs []*fslayer.RodentLocation) (inserts uint, updates uint, err error) {
return doUpdatesViaFunction(ctx, org, fs, "RodentLocation", "fieldseeker.insert_rodentlocation", func(row *fslayer.RodentLocation) ([]SqlParam, error) {
@ -1076,13 +1054,11 @@ func SaveOrUpdateStormDrain(ctx context.Context, org *models.Organization, fs []
func SaveOrUpdateTracklog(ctx context.Context, org *models.Organization, fs []*fslayer.Tracklog) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring RodentInspection data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "Tracklog", "fieldseeker.insert_tracklog", func(row *fslayer.Tracklog) ([]SqlParam, error) {
return []SqlParam{
Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateTrapLocation(ctx context.Context, org *models.Organization, fs []*fslayer.TrapLocation) (inserts uint, updates uint, err error) {
return doUpdatesViaFunction(ctx, org, fs, "TrapLocation", "fieldseeker.insert_traplocation", func(row *fslayer.TrapLocation) ([]SqlParam, error) {
@ -1328,13 +1304,11 @@ func SaveOrUpdateTreatmentArea(ctx context.Context, org *models.Organization, fs
func SaveOrUpdateULVSprayRoute(ctx context.Context, org *models.Organization, fs []*fslayer.ULVSprayRoute) (inserts uint, updates uint, err error) {
log.Warn().Msg("Ignoring RodentInspection data")
return 0, 0, nil
/*
return doUpdatesViaFunction(ctx, org, fs, "ULVSprayRoute", "fieldseeker.insert_ulvsprayroute", func(row *fslayer.ULVSprayRoute) ([]SqlParam, error) {
return []SqlParam{
Uint("p_objectid", row.ObjectID),
}, nil
})
*/
}
func SaveOrUpdateZones(ctx context.Context, org *models.Organization, fs []*fslayer.Zones) (inserts uint, updates uint, err error) {
return doUpdatesViaFunction(ctx, org, fs, "Zones", "fieldseeker.insert_zones", func(row *fslayer.Zones) ([]SqlParam, error) {
@ -1442,3 +1416,4 @@ func toUUID(u googleuuid.UUID) omitnull.Val[uuid.UUID] {
func toObjectID(o uint) omit.Val[int64] {
return omit.From[int64](int64(o))
}
*/

110
db/prepared.go
View file

@ -10,6 +10,7 @@ import (
"time"
fslayer "github.com/Gleipnir-Technology/arcgis-go/fieldseeker/layer"
"github.com/Gleipnir-Technology/arcgis-go/response"
"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/bob/dialect/psql"
"github.com/google/uuid"
@ -81,48 +82,49 @@ func TestPreparedQueryOld(ctx context.Context) error {
return nil
}
func TestPreparedQuery(ctx context.Context, row *fslayer.RodentLocation) error {
q := queryStoredProcedure("fieldseeker.insert_rodentlocation",
Uint("p_objectid", row.ObjectID),
String("p_locationname", row.LocationName),
String("p_zone", row.Zone),
String("p_zone2", row.Zone2),
String("p_habitat", row.Habitat),
String("p_priority", row.Priority),
String("p_usetype", row.Usetype),
Int16("p_active", row.Active),
String("p_description", row.Description),
String("p_accessdesc", row.Accessdesc),
String("p_comments", row.Comments),
String("p_symbology", row.Symbology),
String("p_externalid", row.ExternalID),
Timestamp("p_nextactiondatescheduled", row.Nextactiondatescheduled),
Int32("p_locationnumber", row.Locationnumber),
Timestamp("p_lastinspectdate", row.LastInspectionDate),
String("p_lastinspectspecies", row.LastInspectionSpecies),
String("p_lastinspectaction", row.LastInspectionAction),
String("p_lastinspectconditions", row.LastInspectionConditions),
String("p_lastinspectrodentevidence", row.LastInspectionRodentEvidence),
UUID("p_globalid", row.GlobalID),
String("p_created_user", row.CreatedUser),
Timestamp("p_created_date", row.CreatedDate),
String("p_last_edited_user", row.LastEditedUser),
Timestamp("p_last_edited_date", row.LastEditedDate),
Timestamp("p_creationdate", row.CreationDate),
String("p_creator", row.Creator),
Timestamp("p_editdate", row.EditDate),
String("p_editor", row.Editor),
String("p_jurisdiction", row.Jurisdiction),
)
query := psql.RawQuery(q)
log.Info().Str("query", q).Msg("querying")
result, err := bob.One[InsertResultRow](ctx, PGInstance.BobDB, query, scan.StructMapper[InsertResultRow]())
if err != nil {
return fmt.Errorf("Failed to execute test function: %w", err)
}
//log.Info().Int("version", result.NextVersion).Msg("got result")
//log.Info().Bool("added", result.Row.Added).Int("version", result.Row.Version).Msg("done")
log.Info().Bool("inserted", result.Inserted).Int("version", result.Version).Msg("done")
/*
q := queryStoredProcedure("fieldseeker.insert_rodentlocation",
Uint("p_objectid", row.ObjectID),
String("p_locationname", row.LocationName),
String("p_zone", row.Zone),
String("p_zone2", row.Zone2),
String("p_habitat", row.Habitat),
String("p_priority", row.Priority),
String("p_usetype", row.Usetype),
Int16("p_active", row.Active),
String("p_description", row.Description),
String("p_accessdesc", row.Accessdesc),
String("p_comments", row.Comments),
String("p_symbology", row.Symbology),
String("p_externalid", row.ExternalID),
Timestamp("p_nextactiondatescheduled", row.Nextactiondatescheduled),
Int32("p_locationnumber", row.Locationnumber),
Timestamp("p_lastinspectdate", row.LastInspectionDate),
String("p_lastinspectspecies", row.LastInspectionSpecies),
String("p_lastinspectaction", row.LastInspectionAction),
String("p_lastinspectconditions", row.LastInspectionConditions),
String("p_lastinspectrodentevidence", row.LastInspectionRodentEvidence),
UUID("p_globalid", row.GlobalID),
String("p_created_user", row.CreatedUser),
Timestamp("p_created_date", row.CreatedDate),
String("p_last_edited_user", row.LastEditedUser),
Timestamp("p_last_edited_date", row.LastEditedDate),
Timestamp("p_creationdate", row.CreationDate),
String("p_creator", row.Creator),
Timestamp("p_editdate", row.EditDate),
String("p_editor", row.Editor),
String("p_jurisdiction", row.Jurisdiction),
)
query := psql.RawQuery(q)
log.Info().Str("query", q).Msg("querying")
result, err := bob.One[InsertResultRow](ctx, PGInstance.BobDB, query, scan.StructMapper[InsertResultRow]())
if err != nil {
return fmt.Errorf("Failed to execute test function: %w", err)
}
//log.Info().Int("version", result.NextVersion).Msg("got result")
//log.Info().Bool("added", result.Row.Added).Int("version", result.Row.Version).Msg("done")
log.Info().Bool("inserted", result.Inserted).Int("version", result.Version).Msg("done")
*/
return nil
}
@ -511,16 +513,22 @@ func lineOrNull(msg json.RawMessage) (SqlParam, error) {
return GISLine("p_geospatial", geo, 3857), nil
}
func pointOrNull(msg json.RawMessage) (SqlParam, error) {
// Surprisingly some geos are actually empty
if len(msg) == 0 {
return NullParam{"p_geospatial"}, nil
func pointOrNull(geo response.Geometry) (SqlParam, error) {
switch geo.Type() {
case "esriGeometryPoint":
p, ok := geo.(response.Point)
if !ok {
return nil, fmt.Errorf("point that isn't a point")
}
return GISPoint("p_geospatial", GeometryPoint{
X: p.X,
Y: p.Y,
}, 3857), nil
default:
log.Warn().Str("type", geo.Type()).Msg("expected point, got something else")
return nil, nil
}
geo, err := parsePoint(msg)
if err != nil {
return NullParam{"p_geospatial"}, fmt.Errorf("Failed to pepare GISPoint: %w", err)
}
return GISPoint("p_geospatial", geo, 3857), nil
}
func polygonOrNull(msg json.RawMessage) (SqlParam, error) {

6
db/sql/org_by_oauth_id.bob.sql
View file

@ -2,8 +2,10 @@
-- This file is meant to be re-generated in place and/or deleted at any time.
-- OrgByOauthId
SELECT o.id AS organization_id, o.arcgis_id AS arcgis_id, o.fieldseeker_url AS fieldseeker_url
FROM oauth_token ot
SELECT o.id AS organization_id, aa.id AS arcgis_id, asf.url AS fieldseeker_url
FROM arcgis.oauth_token ot
JOIN user_ u ON ot.user_id = u.id
JOIN organization o ON u.organization_id = o.id
JOIN arcgis.account aa ON aa.id = o.arcgis_account_id
JOIN arcgis.service_feature asf ON asf.item_id = o.fieldseeker_service_feature_item_id
WHERE ot.id = $1;

6
db/sql/org_by_oauth_id.sql
View file

@ -1,6 +1,8 @@
-- OrgByOauthId
SELECT o.id AS organization_id, o.arcgis_id AS arcgis_id, o.fieldseeker_url AS fieldseeker_url
FROM oauth_token ot
SELECT o.id AS organization_id, aa.id AS arcgis_id, asf.url AS fieldseeker_url
FROM arcgis.oauth_token ot
JOIN user_ u ON ot.user_id = u.id
JOIN organization o ON u.organization_id = o.id
JOIN arcgis.account aa ON aa.id = o.arcgis_account_id
JOIN arcgis.service_feature asf ON asf.item_id = o.fieldseeker_service_feature_item_id
WHERE ot.id = $1