mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
3c15ca6ea6
* App ID * Clean-up * Use ID or name to reference apps * Can use app by name or ID * Get rid of AppName for routes API and model routes API is completely backwards-compatible routes API accepts both app ID and name * Get rid of AppName from calls API and model * Fixing tests * Get rid of AppName from logs API and model * Restrict API to work with app names only * Addressing review comments * Fix for hybrid mode * Fix rebase problems * Addressing review comments * Addressing review comments pt.2 * Fixing test issue * Addressing review comments pt.3 * Updated docstring * Adjust UpdateApp SQL implementation to work with app IDs instead of names * Fixing tests * fmt after rebase * Make tests green again! * Use GetAppByID wherever it is necessary - adding new v2 endpoints to keep hybrid api/runner mode working - extract CallBase from Call object to expose that to a user (it doesn't include any app reference, as we do for all other API objects) * Get rid of GetAppByName * Adjusting server router setup * Make hybrid work again * Fix datastore tests * Fixing tests * Do not ignore app_id * Resolve issues after rebase * Updating test to make it work as it was * Tabula rasa for migrations * Adding calls API test - we need to ensure we give "App not found" for the missing app and missing call in first place - making previous test work (request missing call for the existing app) * Make datastore tests work fine with correctly applied migrations * Make CallFunction middleware work again had to adjust its implementation to set app ID before proceeding * The biggest rebase ever made * Fix 8's migration * Fix tests * Fix hybrid client * Fix tests problem * Increment app ID migration version * Fixing TestAppUpdate * Fix rebase issues * Addressing review comments * Renew vendor * Updated swagger doc per recommendations
71 lines
1.7 KiB
Go
71 lines
1.7 KiB
Go
package server
|
|
|
|
import (
|
|
"net/http"
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/fnproject/fn/api"
|
|
"github.com/fnproject/fn/api/models"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/go-openapi/strfmt"
|
|
)
|
|
|
|
func (s *Server) handleCallList(c *gin.Context) {
|
|
ctx := c.Request.Context()
|
|
var err error
|
|
|
|
appID := c.MustGet(api.AppID).(string)
|
|
// TODO api.CRoute needs to be escaped probably, since it has '/' a lot
|
|
filter := models.CallFilter{AppID: appID, Path: c.Query("path")}
|
|
filter.Cursor, filter.PerPage = pageParams(c, false) // ids are url safe
|
|
|
|
filter.FromTime, filter.ToTime, err = timeParams(c)
|
|
if err != nil {
|
|
handleErrorResponse(c, err)
|
|
return
|
|
}
|
|
|
|
calls, err := s.datastore.GetCalls(ctx, &filter)
|
|
|
|
var nextCursor string
|
|
if len(calls) > 0 && len(calls) == filter.PerPage {
|
|
nextCursor = calls[len(calls)-1].ID
|
|
// don't base64, IDs are url safe
|
|
}
|
|
|
|
c.JSON(http.StatusOK, callsResponse{
|
|
Message: "Successfully listed calls",
|
|
NextCursor: nextCursor,
|
|
Calls: calls,
|
|
})
|
|
}
|
|
|
|
// "" gets parsed to a zero time, which is fine (ignored in query)
|
|
func timeParams(c *gin.Context) (fromTime, toTime strfmt.DateTime, err error) {
|
|
fromStr := c.Query("from_time")
|
|
toStr := c.Query("to_time")
|
|
var ok bool
|
|
if fromStr != "" {
|
|
fromTime, ok = strToTime(fromStr)
|
|
if !ok {
|
|
return fromTime, toTime, models.ErrInvalidFromTime
|
|
}
|
|
}
|
|
if toStr != "" {
|
|
toTime, ok = strToTime(toStr)
|
|
if !ok {
|
|
return fromTime, toTime, models.ErrInvalidToTime
|
|
}
|
|
}
|
|
return fromTime, toTime, nil
|
|
}
|
|
|
|
func strToTime(str string) (strfmt.DateTime, bool) {
|
|
sec, err := strconv.ParseInt(str, 10, 64)
|
|
if err != nil {
|
|
return strfmt.DateTime(time.Time{}), false
|
|
}
|
|
return strfmt.DateTime(time.Unix(sec, 0)), true
|
|
}
|