Savepoint

nkonev · Nov 23, 2023 · 9b26f52 · 9b26f52
1 parent cc46597
commit 9b26f52
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/event/graph/schema.resolvers.go b/event/graph/schema.resolvers.go
@@ -249,7 +249,7 @@ func (r *subscriptionResolver) UserAccountEvents(ctx context.Context, userIds []
 		switch typedEvent := event.(type) {
 		case dto.UserAccountEventGroup:
 			if typedEvent.ForRoleUser != nil && utils.Contains(userIds, typedEvent.UserId) {
-				var anEvent = convertUserAccountEvent(typedEvent)
+				var anEvent = convertUserAccountEvent(typedEvent.EventType, typedEvent.ForRoleUser)
 				cam <- anEvent
 			}
 			break
@@ -296,20 +296,19 @@ type subscriptionResolver struct{ *Resolver }
 //   - When renaming or deleting a resolver the old code will be put in here. You can safely delete
 //     it when you're done.
 //   - You have helper methods in this file. Move them out to keep these resolver files clean.
-func convertUserAccountEvent(event dto.UserAccountEventGroup) *model.UserAccountEvent {
+func convertUserAccountEvent(eventType string, forRoleUser *dto.UserAccount) *model.UserAccountEvent {
 	ret := model.UserAccountEvent{}
-	ret.EventType = event.EventType
+	ret.EventType = eventType
 
-	userAccount := event.ForRoleUser
-	if userAccount != nil {
+	if forRoleUser != nil {
 		ret.UserAccountEvent = &model.UserAccountDto{
-			ID:                userAccount.Id,
-			Login:             userAccount.Login,
-			Avatar:            userAccount.Avatar,
-			AvatarBig:         userAccount.AvatarBig,
-			ShortInfo:         userAccount.ShortInfo,
-			LastLoginDateTime: userAccount.LastLoginDateTime,
-			Oauth2Identifiers: convertOauth2Identifiers(userAccount.Oauth2Identifiers),
+			ID:                forRoleUser.Id,
+			Login:             forRoleUser.Login,
+			Avatar:            forRoleUser.Avatar,
+			AvatarBig:         forRoleUser.AvatarBig,
+			ShortInfo:         forRoleUser.ShortInfo,
+			LastLoginDateTime: forRoleUser.LastLoginDateTime,
+			Oauth2Identifiers: convertOauth2Identifiers(forRoleUser.Oauth2Identifiers),
 		}
 	}