move AppResume to types

tsuru · Apr 9, 2024 · afc8a81 · afc8a81
1 parent 00d13da
commit afc8a81
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/api/app.go b/api/app.go
@@ -181,34 +181,15 @@ func appDelete(w http.ResponseWriter, r *http.Request, t auth.Token) (err error)
  return app.Delete(ctx, &a, evt, requestIDHeader(r))
 }
 
-// miniApp is a minimal representation of the app, created to make appList
-// faster and transmit less data.
-type miniApp struct {
- Name string `json:"name"`
- Pool string `json:"pool"`
- TeamOwner string `json:"teamowner"`
- Plan appTypes.Plan `json:"plan"`
- Units []provTypes.Unit `json:"units"`
- CName []string `json:"cname"`
- IP string `json:"ip"`
- Routers []appTypes.AppRouter `json:"routers"`
- Lock appTypes.AppLock `json:"lock"`
- Tags []string `json:"tags"`
- Error string `json:"error,omitempty"`
- Platform string `json:"platform,omitempty"`
- Description string `json:"description,omitempty"`
- Metadata appTypes.Metadata `json:"metadata,omitempty"`
-}
-
-func minifyApp(app app.App, unitData app.AppUnitsResponse, extended bool) (miniApp, error) {
+func minifyApp(app app.App, unitData app.AppUnitsResponse, extended bool) (appTypes.AppResume, error) {
  var errorStr string
  if unitData.Err != nil {
  errorStr = unitData.Err.Error()
  }
  if unitData.Units == nil {
  unitData.Units = []provTypes.Unit{}
  }
- ma := miniApp{
+ ma := appTypes.AppResume{
  Name: app.Name,
  Pool: app.Pool,
  Plan: app.Plan,
@@ -306,7 +287,7 @@ func appList(w http.ResponseWriter, r *http.Request, t auth.Token) error {
  simple, _ := strconv.ParseBool(r.URL.Query().Get("simplified"))
  extended, _ := strconv.ParseBool(r.URL.Query().Get("extended"))
  w.Header().Set("Content-Type", "application/json")
- miniApps := make([]miniApp, len(apps))
+ miniApps := make([]appTypes.AppResume, len(apps))
  if simple {
  for i, ap := range apps {
  ur := app.AppUnitsResponse{Units: nil, Err: nil}

diff --git a/types/app/app.go b/types/app/app.go
@@ -104,3 +104,22 @@ type AppInternalAddress struct {
  Version string
  Process string
 }
+
+// AppResume is a minimal representation of the app, created to make appList
+// faster and transmit less data.
+type AppResume struct {
+ Name string `json:"name"`
+ Pool string `json:"pool"`
+ TeamOwner string `json:"teamowner"`
+ Plan Plan `json:"plan"`
+ Units []provision.Unit `json:"units"`
+ CName []string `json:"cname"`
+ IP string `json:"ip"`
+ Routers []AppRouter `json:"routers"`
+ Lock AppLock `json:"lock"`
+ Tags []string `json:"tags"`
+ Error string `json:"error,omitempty"`
+ Platform string `json:"platform,omitempty"`
+ Description string `json:"description,omitempty"`
+ Metadata Metadata `json:"metadata,omitempty"`
+}