/api/audit-recovery supports "unacknowledged=true" query param filter

build.sh

@@ -6,7 +6,7 @@
 #
 set -e
 
-RELEASE_VERSION="1.4.468"
+RELEASE_VERSION="1.4.469"
 TOPDIR=/tmp/orchestrator-release
 export RELEASE_VERSION TOPDIR
 

go/http/api.go

@@ -1890,7 +1890,8 @@ func (this *HttpAPI) AuditRecovery(params martini.Params, r render.Render, req *
 	if err != nil || page < 0 {
 		page = 0
 	}
-	audits, err := logic.ReadRecentRecoveries(params["clusterName"], page)
+	unacknowledgedOnly := (req.URL.Query().Get("unacknowledged") == "true")
+	audits, err := logic.ReadRecentRecoveries(params["clusterName"], unacknowledgedOnly, page)
 
 	if err != nil {
 		r.JSON(200, &APIResponse{Code: ERROR, Message: fmt.Sprintf("%+v", err)})

go/logic/topology_recovery_dao.go

@@ -485,13 +485,17 @@ func ReadCompletedRecoveries(page int) ([]TopologyRecovery, error) {
 }
 
 // ReadCRecoveries reads latest recovery entries from topology_recovery
-func ReadRecentRecoveries(clusterName string, page int) ([]TopologyRecovery, error) {
+func ReadRecentRecoveries(clusterName string, unacknowledgedOnly bool, page int) ([]TopologyRecovery, error) {
+	whereConditions := []string{}
 	whereClause := ""
+	if unacknowledgedOnly {
+		whereConditions = append(whereConditions, `acknowledged=0`)
+	}
 	if clusterName != "" {
-		whereClause = fmt.Sprintf(`
-		where 
-			cluster_name='%s'`,
-			clusterName)
+		whereConditions = append(whereConditions, fmt.Sprintf(`cluster_name='%s'`, clusterName))
+	}
+	if len(whereConditions) > 0 {
+		whereClause = fmt.Sprintf("where %s", strings.Join(whereConditions, " and "))
 	}
 	limit := fmt.Sprintf(`
 		limit %d