amigan/stillbox
1
1
Fork 0
Code Issues 33 Pull requests Projects Releases Packages Wiki Activity Actions

Call count

Browse source
This commit is contained in:
Daniel Ponte 2024-12-29 19:28:50 -05:00
parent 223f4d5bbe
commit af950c2da7
6 changed files with 57 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkg/database/incidents.sql.go
View file

@ -250,8 +250,10 @@ SELECT
i.start_time, i.start_time,
i.end_time, i.end_time,
i.location, i.location,
i.metadata i.metadata,
COUNT(ic.incident_id) calls_count
FROM incidents i FROM incidents i
LEFT JOIN incidents_calls ic ON i.id = ic.incident_id
WHERE WHERE
CASE WHEN $1::TIMESTAMPTZ IS NOT NULL THEN CASE WHEN $1::TIMESTAMPTZ IS NOT NULL THEN
i.start_time >= $1 ELSE TRUE END AND i.start_time >= $1 ELSE TRUE END AND
@ -261,6 +263,7 @@ CASE WHEN $2::TIMESTAMPTZ IS NOT NULL THEN
i.name ILIKE '%' || $3 || '%' OR i.name ILIKE '%' || $3 || '%' OR
i.description ILIKE '%' || $3 || '%' i.description ILIKE '%' || $3 || '%'
) ELSE TRUE END) ) ELSE TRUE END)
GROUP BY i.id
ORDER BY ORDER BY
CASE WHEN $4::TEXT = 'asc' THEN i.start_time END ASC, CASE WHEN $4::TEXT = 'asc' THEN i.start_time END ASC,
CASE WHEN $4::TEXT = 'desc' THEN i.start_time END DESC CASE WHEN $4::TEXT = 'desc' THEN i.start_time END DESC
@ -277,7 +280,18 @@ type ListIncidentsPParams struct {
PerPage int32 `json:"per_page"` PerPage int32 `json:"per_page"`
} }
func (q *Queries) ListIncidentsP(ctx context.Context, arg ListIncidentsPParams) ([]Incident, error) { type ListIncidentsPRow struct {
ID uuid.UUID `json:"id"`
Name string `json:"name"`
Description *string `json:"description"`
StartTime pgtype.Timestamptz `json:"start_time"`
EndTime pgtype.Timestamptz `json:"end_time"`
Location []byte `json:"location"`
Metadata jsontypes.Metadata `json:"metadata"`
CallsCount int64 `json:"calls_count"`
}
func (q *Queries) ListIncidentsP(ctx context.Context, arg ListIncidentsPParams) ([]ListIncidentsPRow, error) {
rows, err := q.db.Query(ctx, listIncidentsP, rows, err := q.db.Query(ctx, listIncidentsP,
arg.Start, arg.Start,
arg.End, arg.End,
@ -290,9 +304,9 @@ func (q *Queries) ListIncidentsP(ctx context.Context, arg ListIncidentsPParams)
return nil, err return nil, err
} }
defer rows.Close() defer rows.Close()
var items []Incident var items []ListIncidentsPRow
for rows.Next() { for rows.Next() {
var i Incident var i ListIncidentsPRow
if err := rows.Scan( if err := rows.Scan(
&i.ID, &i.ID,
&i.Name, &i.Name,
@ -301,6 +315,7 @@ func (q *Queries) ListIncidentsP(ctx context.Context, arg ListIncidentsPParams)
&i.EndTime, &i.EndTime,
&i.Location, &i.Location,
&i.Metadata, &i.Metadata,
&i.CallsCount,
); err != nil { ); err != nil {
return nil, err return nil, err
} }

14
pkg/database/mocks/Store.go
View file

@ -2829,23 +2829,23 @@ func (_c *Store_ListIncidentsCount_Call) RunAndReturn(run func(context.Context,
} }
// ListIncidentsP provides a mock function with given fields: ctx, arg // ListIncidentsP provides a mock function with given fields: ctx, arg
func (_m *Store) ListIncidentsP(ctx context.Context, arg database.ListIncidentsPParams) ([]database.Incident, error) { func (_m *Store) ListIncidentsP(ctx context.Context, arg database.ListIncidentsPParams) ([]database.ListIncidentsPRow, error) {
ret := _m.Called(ctx, arg) ret := _m.Called(ctx, arg)
if len(ret) == 0 { if len(ret) == 0 {
panic("no return value specified for ListIncidentsP") panic("no return value specified for ListIncidentsP")
} }
var r0 []database.Incident var r0 []database.ListIncidentsPRow
var r1 error var r1 error
if rf, ok := ret.Get(0).(func(context.Context, database.ListIncidentsPParams) ([]database.Incident, error)); ok { if rf, ok := ret.Get(0).(func(context.Context, database.ListIncidentsPParams) ([]database.ListIncidentsPRow, error)); ok {
return rf(ctx, arg) return rf(ctx, arg)
} }
if rf, ok := ret.Get(0).(func(context.Context, database.ListIncidentsPParams) []database.Incident); ok { if rf, ok := ret.Get(0).(func(context.Context, database.ListIncidentsPParams) []database.ListIncidentsPRow); ok {
r0 = rf(ctx, arg) r0 = rf(ctx, arg)
} else { } else {
if ret.Get(0) != nil { if ret.Get(0) != nil {
r0 = ret.Get(0).([]database.Incident) r0 = ret.Get(0).([]database.ListIncidentsPRow)
} }
} }
@ -2877,12 +2877,12 @@ func (_c *Store_ListIncidentsP_Call) Run(run func(ctx context.Context, arg datab
return _c return _c
} }
func (_c *Store_ListIncidentsP_Call) Return(_a0 []database.Incident, _a1 error) *Store_ListIncidentsP_Call { func (_c *Store_ListIncidentsP_Call) Return(_a0 []database.ListIncidentsPRow, _a1 error) *Store_ListIncidentsP_Call {
_c.Call.Return(_a0, _a1) _c.Call.Return(_a0, _a1)
return _c return _c
} }
func (_c *Store_ListIncidentsP_Call) RunAndReturn(run func(context.Context, database.ListIncidentsPParams) ([]database.Incident, error)) *Store_ListIncidentsP_Call { func (_c *Store_ListIncidentsP_Call) RunAndReturn(run func(context.Context, database.ListIncidentsPParams) ([]database.ListIncidentsPRow, error)) *Store_ListIncidentsP_Call {
_c.Call.Return(run) _c.Call.Return(run)
return _c return _c
} }

2
pkg/database/querier.go
View file

@ -54,7 +54,7 @@ type Querier interface {
ListCallsCount(ctx context.Context, arg ListCallsCountParams) (int64, error) ListCallsCount(ctx context.Context, arg ListCallsCountParams) (int64, error)
ListCallsP(ctx context.Context, arg ListCallsPParams) ([]ListCallsPRow, error) ListCallsP(ctx context.Context, arg ListCallsPParams) ([]ListCallsPRow, error)
ListIncidentsCount(ctx context.Context, start pgtype.Timestamptz, end pgtype.Timestamptz, filter *string) (int64, error) ListIncidentsCount(ctx context.Context, start pgtype.Timestamptz, end pgtype.Timestamptz, filter *string) (int64, error)
ListIncidentsP(ctx context.Context, arg ListIncidentsPParams) ([]Incident, error) ListIncidentsP(ctx context.Context, arg ListIncidentsPParams) ([]ListIncidentsPRow, error)
RemoveFromIncident(ctx context.Context, iD uuid.UUID, callIds []uuid.UUID) error RemoveFromIncident(ctx context.Context, iD uuid.UUID, callIds []uuid.UUID) error
RestoreTalkgroupVersion(ctx context.Context, versionIds int) (Talkgroup, error) RestoreTalkgroupVersion(ctx context.Context, versionIds int) (Talkgroup, error)
SetAppPrefs(ctx context.Context, appName string, prefs []byte, uid int) error SetAppPrefs(ctx context.Context, appName string, prefs []byte, uid int) error

30
pkg/incidents/incstore/store.go
View file

@ -35,7 +35,7 @@ type Store interface {
UpdateNotes(ctx context.Context, incidentID uuid.UUID, callID uuid.UUID, notes []byte) error UpdateNotes(ctx context.Context, incidentID uuid.UUID, callID uuid.UUID, notes []byte) error
// Incidents gets incidents matching parameters and pagination. // Incidents gets incidents matching parameters and pagination.
Incidents(ctx context.Context, p IncidentsParams) (incs []incidents.Incident, totalCount int, err error) Incidents(ctx context.Context, p IncidentsParams) (incs []Incident, totalCount int, err error)
// Incident gets a single incident. // Incident gets a single incident.
Incident(ctx context.Context, id uuid.UUID) (*incidents.Incident, error) Incident(ctx context.Context, id uuid.UUID) (*incidents.Incident, error)
@ -152,7 +152,7 @@ func (s *store) AddRemoveIncidentCalls(ctx context.Context, incidentID uuid.UUID
}, pgx.TxOptions{}) }, pgx.TxOptions{})
} }
func (s *store) Incidents(ctx context.Context, p IncidentsParams) (incs []incidents.Incident, totalCount int, err error) { func (s *store) Incidents(ctx context.Context, p IncidentsParams) (incs []Incident, totalCount int, err error) {
db := database.FromCtx(ctx) db := database.FromCtx(ctx)
offset, perPage := p.Pagination.OffsetPerPage(100) offset, perPage := p.Pagination.OffsetPerPage(100)
@ -166,7 +166,7 @@ func (s *store) Incidents(ctx context.Context, p IncidentsParams) (incs []incide
} }
var count int64 var count int64
var rows []database.Incident var rows []database.ListIncidentsPRow
txErr := db.InTx(ctx, func(db database.Store) error { txErr := db.InTx(ctx, func(db database.Store) error {
var err error var err error
count, err = db.ListIncidentsCount(ctx, dbParam.Start, dbParam.End, dbParam.Filter) count, err = db.ListIncidentsCount(ctx, dbParam.Start, dbParam.End, dbParam.Filter)
@ -185,9 +185,9 @@ func (s *store) Incidents(ctx context.Context, p IncidentsParams) (incs []incide
return nil, 0, txErr return nil, 0, txErr
} }
incs = make([]incidents.Incident, 0, len(rows)) incs = make([]Incident, 0, len(rows))
for _, v := range rows { for _, v := range rows {
incs = append(incs, fromDBIncident(v.ID, v)) incs = append(incs, fromDBListInPRow(v.ID, v))
} }
return incs, int(count), err return incs, int(count), err
@ -204,6 +204,26 @@ func fromDBIncident(id uuid.UUID, d database.Incident) incidents.Incident {
} }
} }
type Incident struct {
incidents.Incident
CallCount int `json:"callCount"`
}
func fromDBListInPRow(id uuid.UUID, d database.ListIncidentsPRow) Incident {
return Incident{
Incident: incidents.Incident{
ID: id,
Name: d.Name,
Description: d.Description,
StartTime: jsontypes.TimePtrFromTSTZ(d.StartTime),
EndTime: jsontypes.TimePtrFromTSTZ(d.EndTime),
Metadata: d.Metadata,
},
CallCount: int(d.CallsCount),
}
}
func fromDBCalls(d []database.GetIncidentCallsRow) []incidents.IncidentCall { func fromDBCalls(d []database.GetIncidentCallsRow) []incidents.IncidentCall {
r := make([]incidents.IncidentCall, 0, len(d)) r := make([]incidents.IncidentCall, 0, len(d))
for _, v := range d { for _, v := range d {

2
pkg/rest/incidents.go
View file

@ -55,7 +55,7 @@ func (ia *incidentsAPI) listIncidents(w http.ResponseWriter, r *http.Request) {
} }
res := struct { res := struct {
Incidents []incidents.Incident `json:"incidents"` Incidents []incstore.Incident `json:"incidents"`
Count int `json:"count"` Count int `json:"count"`
}{} }{}

5
sql/postgres/queries/incidents.sql
View file

@ -58,8 +58,10 @@ SELECT
i.start_time, i.start_time,
i.end_time, i.end_time,
i.location, i.location,
i.metadata i.metadata,
COUNT(ic.incident_id) calls_count
FROM incidents i FROM incidents i
LEFT JOIN incidents_calls ic ON i.id = ic.incident_id
WHERE WHERE
CASE WHEN sqlc.narg('start')::TIMESTAMPTZ IS NOT NULL THEN CASE WHEN sqlc.narg('start')::TIMESTAMPTZ IS NOT NULL THEN
i.start_time >= sqlc.narg('start') ELSE TRUE END AND i.start_time >= sqlc.narg('start') ELSE TRUE END AND
@ -69,6 +71,7 @@ CASE WHEN sqlc.narg('end')::TIMESTAMPTZ IS NOT NULL THEN
i.name ILIKE '%' || @filter || '%' OR i.name ILIKE '%' || @filter || '%' OR
i.description ILIKE '%' || @filter || '%' i.description ILIKE '%' || @filter || '%'
) ELSE TRUE END) ) ELSE TRUE END)
GROUP BY i.id
ORDER BY ORDER BY
CASE WHEN @direction::TEXT = 'asc' THEN i.start_time END ASC, CASE WHEN @direction::TEXT = 'asc' THEN i.start_time END ASC,
CASE WHEN @direction::TEXT = 'desc' THEN i.start_time END DESC CASE WHEN @direction::TEXT = 'desc' THEN i.start_time END DESC