[FIX] only return success version info

api/controller/resources.go

@@ -156,8 +156,6 @@ func (t *TenantStruct) TenantResources(w http.ResponseWriter, r *http.Request) {
 	if !ok {
 		return
 	}
-	reqb, _ := json.Marshal(tr)
-	logrus.Debugf("request uri: %s; request body: %s", r.RequestURI, string(reqb))
 
 	rep, err := handler.GetTenantManager().GetTenantsResources(&tr)
 	if err != nil {

api/controller/serviceAction.go

@@ -535,7 +535,7 @@ func (t *TenantStruct) BuildService(w http.ResponseWriter, r *http.Request) {
 //BuildList BuildList
 func (t *TenantStruct) BuildList(w http.ResponseWriter, r *http.Request) {
 	serviceID := r.Context().Value(middleware.ContextKey("service_id")).(string)
-	versionInfoList, err := db.GetManager().VersionInfoDao().GetVersionByServiceID(serviceID)
+	versionInfoList, err := db.GetManager().VersionInfoDao().GetAllVersionByServiceID(serviceID)
 	if err != nil && err != gorm.ErrRecordNotFound {
 		logrus.Error("get version info error", err.Error())
 		httputil.ReturnError(r, w, 500, fmt.Sprintf("get version info erro, %v", err))

api/handler/cloud/chargesverify.go

@@ -87,10 +87,8 @@ func PriChargeSverify(tenant *model.Tenants, quantity int) *util.APIHandleError
 	var usedMem int
 	if len(svcids) > 0 {
 		ss := handler.GetTenantManager().GetServicesStatus(strings.Join(svcids, ","))
-		logrus.Debugf("service status: %v", ss)
 		for k, v := range ss {
 			if !handler.GetTenantManager().IsClosedStatus(v) {
-				logrus.Debugf("not closed service: %s; status: %s", k, v)
 				if svc, ok := svcMap[k]; ok {
 					usedMem += svc.ContainerMemory
 				}
@@ -103,12 +101,9 @@ func PriChargeSverify(tenant *model.Tenants, quantity int) *util.APIHandleError
 		logrus.Errorf("error getting tenant: %v", err)
 		return util.CreateAPIHandleError(500, fmt.Errorf("error getting tenant: %v", err))
 	}
-	logrus.Debugf("t.LimitMemory: %d", t.LimitMemory)
 	availMem := int64(t.LimitMemory)
-	logrus.Debugf("availMem: %d", availMem)
 
 	if availMem == 0 {
-		logrus.Debugf("available memory is zero.")
 		_, allMem, err := handler.GetTenantManager().GetAllocatableResources()
 		if err != nil {
 			logrus.Errorf("error getting allocatable resources: %v", err)
@@ -125,7 +120,6 @@ func PriChargeSverify(tenant *model.Tenants, quantity int) *util.APIHandleError
 			availMem = availMem - int64(item.LimitMemory)
 		}
 	} else {
-		logrus.Debugf("available memory isn't zero.")
 		availMem = availMem - int64(usedMem)
 	}
 

db/dao/dao.go

@@ -291,6 +291,7 @@ type VersionInfoDao interface {
 	GetVersionByEventID(eventID string) (*model.VersionInfo, error)
 	GetVersionByDeployVersion(version, serviceID string) (*model.VersionInfo, error)
 	GetVersionByServiceID(serviceID string) ([]*model.VersionInfo, error)
+	GetAllVersionByServiceID(serviceID string) ([]*model.VersionInfo, error)
 	DeleteVersionByEventID(eventID string) error
 	DeleteVersionByServiceID(serviceID string) error
 	GetVersionInfo(timePoint time.Time, serviceIdList []string) ([]*model.VersionInfo, error)

db/mysql/dao/version.go

@@ -106,6 +106,15 @@ func (c *VersionInfoDaoImpl) GetVersionByServiceID(serviceID string) ([]*model.V
 	return result, nil
 }
 
+//GetAllVersionByServiceID get all versions by service id, not only successful
+func (c *VersionInfoDaoImpl) GetAllVersionByServiceID(serviceID string) ([]*model.VersionInfo, error) {
+	var result []*model.VersionInfo
+	if err := c.DB.Where("service_id=?", serviceID).Find(&result).Error; err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
 //GetVersionInfo get version info by service ids
 func (c *VersionInfoDaoImpl) GetVersionInfo(timePoint time.Time, serviceIDs []string) ([]*model.VersionInfo, error) {
 	var result []*model.VersionInfo