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

Get nidus-sync building again

Browse source 
This fleshes out more of the basic platform patterns, though there's
still plenty that isn't working yet.
This commit is contained in:
Eli Ribble 2026-01-05 02:06:34 +00:00
parent ffade2ae56
commit 53e08d840e
4 changed files with 100 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/api.go
View file

@ -180,14 +180,14 @@ func apiMosquitoSource(w http.ResponseWriter, r *http.Request, u *models.User) {
query := db.NewGeoQuery()
query.Bounds = *bounds
query.Limit = 100
sources, err := db.MosquitoSourceQuery()
sources, err := platform.MosquitoSourceQuery()
if err != nil {
render.Render(w, r, errRender(err))
return
}
data := []render.Renderer{}
for _, s := range sources {
for _, s := range *sources {
data = append(data, NewResponseMosquitoSource(s))
}
if err := render.RenderList(w, r, data); err != nil {
@ -205,14 +205,14 @@ func apiTrapData(w http.ResponseWriter, r *http.Request, u *models.User) {
query := db.NewGeoQuery()
query.Bounds = *bounds
query.Limit = 100
trap_data, err := db.TrapDataQuery()
trap_data, err := platform.TrapDataQuery()
if err != nil {
render.Render(w, r, errRender(err))
return
}
data := []render.Renderer{}
for _, td := range trap_data {
for _, td := range *trap_data {
data = append(data, NewResponseTrapDatum(td))
}
if err := render.RenderList(w, r, data); err != nil {
@ -229,14 +229,14 @@ func apiServiceRequest(w http.ResponseWriter, r *http.Request, u *models.User) {
query := db.NewGeoQuery()
query.Bounds = *bounds
query.Limit = 100
requests, err := db.ServiceRequestQuery()
requests, err := platform.ServiceRequestQuery()
if err != nil {
render.Render(w, r, errRender(err))
return
}
data := []render.Renderer{}
for _, sr := range requests {
for _, sr := range *requests {
data = append(data, NewResponseServiceRequest(sr))
}
if err := render.RenderList(w, r, data); err != nil {

117
api/types.go
View file

@ -4,6 +4,7 @@ import (
"net/http"
"time"
"github.com/aarondl/opt/null"
"github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/platform"
"github.com/go-chi/render"
@ -193,7 +194,7 @@ type ResponseMosquitoInspection struct {
func (rtd ResponseMosquitoInspection) Render(w http.ResponseWriter, r *http.Request) error {
return nil
}
func NewResponseMosquitoInspection(i models.FieldseekerMosquitoinspection) ResponseMosquitoInspection {
func NewResponseMosquitoInspection(i *models.FieldseekerMosquitoinspection) ResponseMosquitoInspection {
return ResponseMosquitoInspection{
ActionTaken: i.Actiontaken.GetOr(""),
Comments: i.Comments.GetOr(""),
@ -204,9 +205,9 @@ func NewResponseMosquitoInspection(i models.FieldseekerMosquitoinspection) Respo
SiteCondition: i.Sitecond.GetOr(""),
}
}
func NewResponseMosquitoInspections(inspections []models.FieldseekerMosquitoinspection) []ResponseMosquitoInspection {
func NewResponseMosquitoInspections(inspections *models.FieldseekerMosquitoinspectionSlice) []ResponseMosquitoInspection {
results := make([]ResponseMosquitoInspection, 0)
for _, i := range inspections {
for _, i := range *inspections {
results = append(results, NewResponseMosquitoInspection(i))
}
return results
@ -216,30 +217,30 @@ func (rtd ResponseMosquitoSource) Render(w http.ResponseWriter, r *http.Request)
return nil
}
func NewResponseMosquitoSource(ms *models.FieldseekerPointlocation) ResponseMosquitoSource {
func NewResponseMosquitoSource(ms *platform.MosquitoSource) ResponseMosquitoSource {
pl := ms.PointLocation
return ResponseMosquitoSource{
//Active: ms.Active.GetOr(0) > 1,
Access: ms.Access.GetOr(""),
Comments: ms.Comments.GetOr(""),
Created: ms.Created.Format("2006-01-02T15:04:05.000Z"),
Description: ms.Description.GetOr(""),
ID: ms.ID.String(),
LastInspectionDate: ms.LastInspectionDate.Format("2006-01-02T15:04:05.000Z"),
Location: NewResponseLocation(ms.Location),
Habitat: ms.Habitat,
Access: pl.Accessdesc.GetOr(""),
Comments: pl.Comments.GetOr(""),
Created: formatTime(pl.Creationdate),
Description: pl.Description.GetOr(""),
ID: pl.Globalid.MustGet().String(),
LastInspectionDate: formatTime(pl.Lastinspectdate),
//Location: NewResponseLocation(ms.Location),
Habitat: pl.Habitat.GetOr(""),
Inspections: NewResponseMosquitoInspections(ms.Inspections),
Name: ms.Name,
NextActionDateScheduled: ms.NextActionDateScheduled.Format("2006-01-02T15:04:05.000Z"),
Name: pl.Name.GetOr(""),
NextActionDateScheduled: formatTime(pl.Nextactiondatescheduled),
Treatments: NewResponseMosquitoTreatments(ms.Treatments),
UseType: ms.UseType,
WaterOrigin: ms.WaterOrigin,
Zone: ms.Zone,
UseType: pl.Usetype.GetOr(""),
WaterOrigin: pl.Waterorigin.GetOr(""),
Zone: pl.Zone.GetOr(""),
}
}
func NewResponseMosquitoSources(sources []platform.MosquitoSource) []ResponseMosquitoSource {
func NewResponseMosquitoSources(sources *[]*platform.MosquitoSource) []ResponseMosquitoSource {
results := make([]ResponseMosquitoSource, 0)
for _, i := range sources {
for _, i := range *sources {
results = append(results, NewResponseMosquitoSource(i))
}
return results
@ -280,9 +281,9 @@ func NewResponseMosquitoTreatment(i *models.FieldseekerTreatment) ResponseMosqui
*/
}
}
func NewResponseMosquitoTreatments(treatments models.FieldseekerTreatmentSlice) []ResponseMosquitoTreatment {
func NewResponseMosquitoTreatments(treatments *models.FieldseekerTreatmentSlice) []ResponseMosquitoTreatment {
results := make([]ResponseMosquitoTreatment, 0)
for _, i := range treatments {
for _, i := range *treatments {
results = append(results, NewResponseMosquitoTreatment(i))
}
return results
@ -322,28 +323,26 @@ func (srr ResponseServiceRequest) Render(w http.ResponseWriter, r *http.Request)
return nil
}
func NewResponseServiceRequest(sr models.FieldseekerServicerequest) ResponseServiceRequest {
func NewResponseServiceRequest(sr *models.FieldseekerServicerequest) ResponseServiceRequest {
return ResponseServiceRequest{
/*
Address: sr.Address(),
AssignedTechnician: sr.AssignedTechnician(),
City: sr.City(),
Created: sr.Created().Format("2006-01-02T15:04:05.000Z"),
HasDog: sr.HasDog(),
HasSpanishSpeaker: sr.HasSpanishSpeaker(),
ID: sr.ID().String(),
Location: NewResponseLocation(sr.Location()),
Priority: sr.Priority(),
Status: sr.Status(),
Source: sr.Source(),
Target: sr.Target(),
Zip: sr.Zip(),
*/
Address: sr.Reqaddr1.GetOr(""),
AssignedTechnician: sr.Assignedtech.GetOr(""),
City: sr.Reqcity.GetOr(""),
Created: formatTime(sr.Creationdate),
HasDog: toBool(sr.Dog),
HasSpanishSpeaker: toBool(sr.Spanish),
ID: sr.Globalid.MustGet().String(),
//Location: NewResponseLocation(sr.Location()),
Priority: sr.Priority.GetOr(""),
Status: sr.Status.GetOr(""),
Source: sr.Source.GetOr(""),
Target: sr.Reqtarget.GetOr(""),
Zip: sr.Reqzip.GetOr(""),
}
}
func NewResponseServiceRequests(requests []platform.ServiceRequest) []ResponseServiceRequest {
func NewResponseServiceRequests(requests *models.FieldseekerServicerequestSlice) []ResponseServiceRequest {
results := make([]ResponseServiceRequest, 0)
for _, i := range requests {
for _, i := range *requests {
results = append(results, NewResponseServiceRequest(i))
}
return results
@ -362,18 +361,16 @@ func (rtd ResponseTrapData) Render(w http.ResponseWriter, r *http.Request) error
}
func NewResponseTrapDatum(td *models.FieldseekerTraplocation) ResponseTrapData {
return ResponseTrapData{
/*
Created: td.Created.Format("2006-01-02T15:04:05.000Z"),
Description: td.Description,
ID: td.ID.String(),
Location: NewResponseLocation(td.Location),
Name: td.Name,
*/
Created: formatTime(td.Creationdate),
Description: td.Description.GetOr(""),
ID: td.Globalid.MustGet().String(),
//Location: NewResponseLocation(td.Location),
Name: td.Name.GetOr(""),
}
}
func NewResponseTrapData(data *models.FieldseekerTraplocation) []ResponseTrapData {
func NewResponseTrapData(data *models.FieldseekerTraplocationSlice) []ResponseTrapData {
results := make([]ResponseTrapData, 0)
for _, i := range data {
for _, i := range *data {
results = append(results, NewResponseTrapDatum(i))
}
return results
@ -383,3 +380,25 @@ func toResponseFieldseeker(csync platform.ClientSync) ResponseFieldseeker {
return ResponseFieldseeker{
}
}
func formatTime(t null.Val[time.Time]) string {
if t.IsNull() {
return ""
}
v := t.MustGet()
return v.Format("2006-01-02T15:04:05.000Z")
}
func toBool(t null.Val[int32]) *bool {
if t.IsNull() {
return nil
}
val := t.MustGet()
var b bool
if val == 0 {
b = false
} else {
b = true
}
return &b
}