fix: exclude canceled job offers (#363)

Co-authored-by: Narb <29411347+narbs91@users.noreply.github.com>

pkg/solver/server.go

@@ -183,6 +183,9 @@ func (solverServer *solverServer) getJobOffers(res corehttp.ResponseWriter, req
 	if notMatched := req.URL.Query().Get("not_matched"); notMatched == "true" {
 		query.NotMatched = true
 	}
+	if includeCancelled := req.URL.Query().Get("include_cancelled"); includeCancelled == "true" {
+		query.IncludeCancelled = true
+	}
 	return solverServer.store.GetJobOffers(query)
 }
 

pkg/solver/store/memory/store.go

@@ -114,6 +114,9 @@ func (s *SolverStoreMemory) GetJobOffers(query store.GetJobOffersQuery) ([]data.
 				matching = false
 			}
 		}
+		if !query.IncludeCancelled && jobOffer.State == data.GetAgreementStateIndex("JobOfferCancelled") {
+			matching = false
+		}
 		if matching {
 			jobOffers = append(jobOffers, *jobOffer)
 		}

pkg/solver/store/types.go

@@ -9,6 +9,9 @@ type GetJobOffersQuery struct {
 
 	// we use the DealID property of the jobOfferContainer to tell if it's been matched
 	NotMatched bool `json:"not_matched"`
+
+	// this will include cancelled job offers in the results
+	IncludeCancelled bool `json:"include_cancelled"`
 }
 
 type GetResourceOffersQuery struct {