Merge pull request #163 from Viva-con-Agua/bugfix/no_income_status

Bugfix/no income status

dao/taking.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"log"
 	"pool-backend/models"
+	"time"
 
 	"github.com/Viva-con-Agua/vcago/vmdb"
 	"github.com/Viva-con-Agua/vcapool"
@@ -106,7 +107,7 @@ func TakingUpdate(ctx context.Context, i *models.TakingUpdate, token *vcapool.Ac
 			err = nil
 		}
 
-		if event.ID != "" {
+		if event.ID != "" && event.EndAt < time.Now().Unix() {
 			event.EventState.OldState = event.EventState.State
 			event.EventState.State = "closed"
 			e := new(models.Event)

dao/update_ticker.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"pool-backend/models"
 	"time"
 
 	"github.com/Viva-con-Agua/vcago/vmdb"
@@ -19,6 +20,7 @@ func UpdateTicker() {
 			select {
 			case <-ticker.C:
 				EventStateUpdateTicker()
+				EventStateNoIncome()
 			case <-quit:
 				ticker.Stop()
 				return
@@ -36,3 +38,21 @@ func EventStateUpdateTicker() {
 		log.Print(err)
 	}
 }
+func EventStateNoIncome() {
+	filter := vmdb.NewFilter()
+	filter.EqualBool("no_income", "true")
+	filter.EqualString("event.event_state.state", "finished")
+	pipeline := models.TakingPipelineTicker().Match(filter.Bson()).Pipe
+	takings := []models.Taking{}
+	if err := TakingCollection.Aggregate(context.Background(), pipeline, takings); err != nil {
+		log.Print(err)
+	}
+	for i := range takings {
+		updateFilter := bson.D{{Key: "_id", Value: takings[i].Event.ID}}
+		update := bson.D{{Key: "event_state.state", Value: "closed"}}
+		if err := TakingCollection.UpdateOne(context.Background(), updateFilter, vmdb.UpdateSet(update), nil); err != nil {
+			log.Print(err)
+		}
+
+	}
+}

models/taking.go

@@ -130,6 +130,12 @@ func TakingPipeline() *vmdb.Pipeline {
 	return pipe
 }
 
+func TakingPipelineTicker() *vmdb.Pipeline {
+	pipe := vmdb.NewPipeline()
+	pipe.LookupUnwind(EventCollection, "_id", "taking_id", "event")
+	return pipe
+}
+
 func (i *TakingCreate) TakingDatabase() *TakingDatabase {
 	return &TakingDatabase{
 		ID:       uuid.NewString(),