ensuring archived is passed into a query

pkg/store/sql/approvals.go

@@ -37,14 +37,20 @@ func (s *SQLStore) UpdateApproval(approval *types.Approval) error {
 }
 
 func (s *SQLStore) GetApproval(q *types.GetApprovalQuery) (*types.Approval, error) {
-	result := types.Approval{}
+	var result types.Approval
-	err := s.db.Where(&types.Approval{
+	var err error
-		ID:         q.ID,
+	if q.ID == "" {
-		Identifier: q.Identifier,
+		err = s.db.Where("identifier = ? AND archived = ?", q.Identifier, q.Archived).First(&result).Error
-		Archived:   q.Archived,
+	} else {
-		// Rejected:   q.Rejected,
+		err = s.db.Where(&types.Approval{
-	}).First(&result).Error
+			ID:         q.ID,
+			Identifier: q.Identifier,
+			Archived:   q.Archived,
+			// Rejected:   q.Rejected,
+		}).First(&result).Error
+	}
 	if err == gorm.ErrRecordNotFound {
+
 		return nil, store.ErrRecordNotFound
 	}