Merge pull request #195 from Viva-con-Agua/stage

Stage
Viva-con-Agua · Jul 10, 2024 · 3fe9593 · 3fe9593
2 parents f2eb4c8 + 1bb8294
commit 3fe9593
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/dao/update_ticker.go b/dao/update_ticker.go
@@ -41,7 +41,9 @@ func EventStateFinishTicker() {
 		log.Print(err)
 	}
 	if err := EventCollection.UpdateMany(context.Background(), filter.Bson(), vmdb.UpdateSet(update)); err != nil {
-		log.Print(err)
+		if !vmdb.ErrNoDocuments(err) {
+			log.Print(err)
+		}
 	}
 	for _, value := range *events {
 		filterTaking := bson.D{{Key: "_id", Value: value.TakingID}, {Key: "taking_id", Value: bson.D{{Key: "$ne", Value: ""}}}}
@@ -68,7 +70,7 @@ func EventStateClosedTicker() {
 	filter.EqualString("event.event_state.state", "finished")
 	pipeline := models.TakingPipeline().Match(filter.Bson()).Pipe
 	takings := []models.Taking{}
-	if err := TakingCollection.Aggregate(context.Background(), pipeline, takings); err != nil {
+	if err := TakingCollection.Aggregate(context.Background(), pipeline, &takings); err != nil {
 		log.Print(err)
 	}
 	for i := range takings {

diff --git a/dao/users.go b/dao/users.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"log"
 	"pool-backend/models"
+	"time"
 
 	"github.com/Viva-con-Agua/vcapool"
 
@@ -38,7 +39,8 @@ func UsersGet(i *models.UserQuery, token *vcapool.AccessToken) (result *[]models
 	if err = models.UsersPermission(token); err != nil {
 		return
 	}
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
 	filter := i.PermittedFilter(token)
 	sort := i.Sort()
 	opt := options.Aggregate()

diff --git a/models/taking.go b/models/taking.go
@@ -112,7 +112,7 @@ func TakingPipeline() *vmdb.Pipeline {
 	pipe.Lookup(SourceCollection, "_id", "taking_id", "sources")
 	pipe.LookupUnwind(CrewCollection, "crew_id", "_id", "crew")
 	pipe.LookupUnwind(EventCollection, "_id", "taking_id", "event")
-	pipe.LookupList(ArtistCollection, "artist_ids", "_id", "event.artists")
+	//pipe.LookupList(ArtistCollection, "event.artist_ids", "_id", "event.artists")
 	pipe.Append(bson.D{{Key: "$addFields", Value: bson.D{
 		{Key: "state.wait.amount", Value: bson.D{{Key: "$sum", Value: "$wait.money.amount"}}},
 	}}})