fix: processor crashes when location dont exist yet (#168)

42atomys · Jul 5, 2022 · e3a5e48 · e3a5e48
1 parent bf47948
commit e3a5e48
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/internal/api/api.resolvers.go b/internal/api/api.resolvers.go
@@ -99,7 +99,10 @@ func (r *mutationResolver) InviteOnDiscord(ctx context.Context) (bool, error) {
 		return false, err
 	}
 
-	acc := r.client.Account.Query().Where(account.UserID(cu.ID), account.Provider(string(typesgen.ProviderDiscord))).OnlyX(ctx)
+	acc, err := r.client.Account.Query().Where(account.UserID(cu.ID), account.Provider(string(typesgen.ProviderDiscord))).Only(ctx)
+	if err != nil {
+		return false, err
+	}
 
 	err = s.GuildMemberAdd(acc.AccessToken, viper.GetString("discord.guildID"), acc.ProviderAccountID, "", []string{}, false, false)
 	if err != nil {

diff --git a/internal/webhooks/location.go b/internal/webhooks/location.go
@@ -7,6 +7,7 @@ import (
 	"github.com/rs/zerolog/log"
 
 	modelsutils "atomys.codes/stud42/internal/models"
+	"atomys.codes/stud42/internal/models/generated"
 	"atomys.codes/stud42/internal/models/generated/campus"
 	"atomys.codes/stud42/internal/models/generated/location"
 	"atomys.codes/stud42/internal/models/generated/user"
@@ -65,22 +66,35 @@ func (p *locationProcessor) Close(loc *duoapi.Location[duoapi.LocationUser], met
 		SetIdentifier(loc.Host).
 		Where(location.DuoID(loc.ID)).
 		Exec(p.ctx)
-	if err != nil {
+
+	if err != nil && !generated.IsNotFound(err) {
 		return err
 	}
 
 	// Unlink the user from the location in database if the location is closed 
 	// and the user is not assigned to another location anymore (i.e. the user
 	// is not assigned to any other location)
-	return p.db.User.UpdateOne(p.db.User.Query().Where(user.DuoID(loc.User.ID)).FirstX(p.ctx)).SetCurrentLocation(nil).Exec(p.ctx)
+	return p.unlinkLocation(loc)
 }
 func (p *locationProcessor) Destroy(loc *duoapi.Location[duoapi.LocationUser], metadata *duoapi.WebhookMetadata) error {
 	// Delete the location in database
 	_, err := p.db.Location.Delete().Where(location.DuoID(loc.ID)).Exec(p.ctx)
-	if err != nil {
+	if err != nil && !generated.IsNotFound(err) {
 		return err
 	}
 
 	// Unlink the user from the location in database if the location is destroyed
-	return p.db.User.UpdateOne(p.db.User.Query().Where(user.DuoID(loc.User.ID)).FirstX(p.ctx)).SetCurrentLocation(nil).Exec(p.ctx)
+	return p.unlinkLocation(loc)
 }
+
+func (p *locationProcessor) unlinkLocation(duoLoc *duoapi.Location[duoapi.LocationUser]) error {
+	user, err := p.db.User.Query().Where(user.DuoID(duoLoc.User.ID)).First(p.ctx)
+	if err != nil {
+		if generated.IsNotFound(err) {
+			return nil
+		}
+		return err
+	}
+
+	return p.db.User.UpdateOne(user).ClearCurrentLocation().Exec(p.ctx)
+}
diff --git a/internal/webhooks/serve.go b/internal/webhooks/serve.go
@@ -31,7 +31,6 @@ func New() *processor {
 }
 
 func (p *processor) Serve(amqpUrl, channel string) error {
-
 	conn, err := amqp.Dial(amqpUrl)
 	if err != nil {
 		return err
@@ -68,7 +67,6 @@ func (p *processor) Serve(amqpUrl, channel string) error {
 
 	log.Info().Msg("Consumer ready. Waiting for messages...")
 	for d := range msgs {
-		log.Debug().Msg("Received a message")
 		err := p.handler(d.Body)
 		if err != nil {
 			sentry.CaptureException(err)
@@ -83,6 +81,7 @@ func (p *processor) Serve(amqpUrl, channel string) error {
 			sentry.CaptureException(err)
 		}
 	}
+
 	return nil
 }