fix the query for the latest versions and create cluster checkins table

Author: Keerthan Mala

pkg/data/clusters_checkins_table.go

@@ -19,18 +19,18 @@ const (
 
 // ClustersCheckinsTable type that expresses the `clusters_checkins` postgres table schema
 type clustersCheckinsTable struct {
-	CheckinID string         `gorm:"primary_key;type:bigserial;column_name:checkins_id"`
-	ClusterID string         `gorm:"type:uuid;column_name:cluster_id;index"`
-	CreatedAt string         `gorm:"type:timestamp;column_name:created_at;index"`
-	Data      types.JSONText `gorm:"type:json;column_name:data"`
+	CheckinsID string         `gorm:"primary_key;type:bigserial;column_name:checkins_id"`
+	ClusterID  string         `gorm:"type:uuid;column_name:cluster_id;index"`
+	CreatedAt  string         `gorm:"type:timestamp;column_name:created_at;index"`
+	Data       types.JSONText `gorm:"type:json;column_name:data"`
 }
 
 func newClustersCheckinsTable(checkinID, clusterID string, createdAt time.Time, clusterData []byte) clustersCheckinsTable {
 	return clustersCheckinsTable{
-		CheckinID: checkinID,
-		ClusterID: clusterID,
-		CreatedAt: Timestamp{Time: createdAt}.String(),
-		Data:      types.JSONText(clusterData),
+		CheckinsID: checkinID,
+		ClusterID:  clusterID,
+		CreatedAt:  Timestamp{Time: createdAt}.String(),
+		Data:       types.JSONText(clusterData),
 	}
 }
 

pkg/data/version.go

@@ -91,16 +91,12 @@ func GetLatestVersions(db *gorm.DB, ct []ComponentAndTrain) ([]*models.Component
 			listedTrains[c.Train] = struct{}{}
 		}
 	}
-
-	rows, err := db.
-		Table("versions").
-		Select("*, MAX(release_timestamp)").
-		Where("component_name IN (?) AND train IN (?)", componentsList, trainsList).
-		Group("component_name, train").
+	rows, err := db.Raw("select * from versions as ver where ver.component_name IN (?) AND ver.train IN (?) AND release_timestamp = (select MAX(release_timestamp) from versions as ver1 where ver1.component_name = ver.component_name AND ver1.train = ver.train)", componentsList, trainsList).
 		Rows()
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	rowsResult := []versionsTable{}
 	for rows.Next() {
 		var row versionsTable
@@ -114,7 +110,6 @@ func GetLatestVersions(db *gorm.DB, ct []ComponentAndTrain) ([]*models.Component
 			&row.Version,
 			&row.ReleaseTimestamp,
 			&row.Data,
-			&sql.NullString{},
 		); err != nil {
 			return nil, err
 		}

pkg/data/version_test.go

@@ -114,7 +114,7 @@ func TestGetLatestVersions(t *testing.T) {
 
 				//specify a different version for each component version in this name/train
 				cv.Version.Version = fmt.Sprintf("version%d-%d", idx, n)
-				cvReleaseTime := time.Now().Add(time.Duration(idx*(n+1)) * time.Hour)
+				cvReleaseTime := time.Now().Add(time.Duration((idx+1)*(n+1)) * time.Hour)
 				cv.Version.Released = cvReleaseTime.Format(released)
 
 				// record the latest release time for each component

pkg/handlers/get_latest_versions.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"log"
 	"net/http"
 
 	"github.com/deis/workflow-manager-api/pkg/data"
@@ -55,6 +56,7 @@ func GetLatestVersions(params operations.GetComponentsByLatestReleaseParams, db
 
 	componentVersions, err := data.GetLatestVersions(db, componentAndTrainSlice)
 	if err != nil {
+		log.Printf("data.GetLatestVersions error (%s)", err)
 		return operations.NewGetComponentsByLatestReleaseDefault(http.StatusInternalServerError).WithPayload(&models.Error{Code: http.StatusInternalServerError, Message: "database error"})
 	}
 	ret := operations.GetComponentsByLatestReleaseOKBodyBody{Data: componentVersions}

pkg/swagger/restapi/configure_workflow_manager.go

@@ -45,6 +45,7 @@ func configureFlags(api *operations.WorkflowManagerAPI) {
 func configureAPI(api *operations.WorkflowManagerAPI) http.Handler {
 
 	rdsDB := getDb(api)
+	rdsDB.LogMode(true)
 	// configure the api here
 	api.ServeError = errors.ServeError