Changes user creation flow, they are now added when first inserted in a match

Author: vanny96

leaderboards/src/main/java/com/lunatech/leaderboard/client/graphql/lunagraph/LunagraphApi.java

@@ -1,12 +1,11 @@
 package com.lunatech.leaderboard.client.graphql.lunagraph;
 
-import com.lunatech.leaderboard.client.graphql.lunagraph.model.LunagraphEmployeeType;
-import com.lunatech.leaderboard.client.graphql.lunagraph.model.LunagraphPeopleModel;
+import com.lunatech.leaderboard.client.graphql.lunagraph.model.LunagraphPersonModel;
 import org.eclipse.microprofile.graphql.Name;
 import org.eclipse.microprofile.graphql.Query;
 
 public interface LunagraphApi {
 
-    @Query("people")
-    LunagraphPeopleModel people(@Name("employeeType") LunagraphEmployeeType employeeType);
+    @Query("person")
+    LunagraphPersonModel person(@Name("emailAddress") String email);
 }

leaderboards/src/main/java/com/lunatech/leaderboard/client/graphql/lunagraph/model/LunagraphPeopleModel.java

@@ -0,0 +1,5 @@
+package com.lunatech.leaderboard.client.graphql.lunagraph.model;
+
+
+public record LunagraphPersonModel(String fullName, String emailAddress) {}
+

leaderboards/src/main/java/com/lunatech/leaderboard/client/graphql/lunagraph/model/LunagraphPersonModel.java

@@ -5,6 +5,7 @@
 import com.lunatech.leaderboard.entity.Match;
 import com.lunatech.leaderboard.entity.User;
 import com.lunatech.leaderboard.service.MatchService;
+import com.lunatech.leaderboard.service.UserService;
 import io.quarkus.security.Authenticated;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Content;
@@ -31,6 +32,9 @@ public class MatchController {
     @Inject
     MatchService matchService;
 
+    @Inject
+    UserService userService;
+
     @PathParam("gameId")
     private Long gameId;
 
@@ -52,7 +56,7 @@ public Response list() {
     @Transactional
     @APIResponseSchema(MatchDto.class)
     public Response add(MatchPostDto body) {
-        Match match = body.toEntity();
+        Match match = body.toEntity(userService);
         matchService.save(match);
 
         return Response.created(URI.create("/games/"+gameId+"/gamemodes/"+gameModeId+"/matches/"+match.id))

leaderboards/src/main/java/com/lunatech/leaderboard/controller/MatchController.java

@@ -4,20 +4,21 @@
 import com.lunatech.leaderboard.entity.GameMode;
 import com.lunatech.leaderboard.entity.Match;
 import com.lunatech.leaderboard.entity.MatchUser;
+import com.lunatech.leaderboard.service.UserService;
 
 import java.util.List;
 
 public record MatchPostDto(Match.Outcome outcome, Long gameModeId, List<MatchUserPostDto> teamA, List<MatchUserPostDto> teamB) {
 
-    public Match toEntity() {
+    public Match toEntity(UserService userService) {
         GameMode gameMode = new GameMode();
         gameMode.id = gameModeId;
 
         Match match = new Match();
         match.gameMode = gameMode;
         match.outcome = outcome;
-        match.teamA = teamA.stream().map(dto -> dto.toEntity(match, MatchUser.Team.TEAM_A)).toList();
-        match.teamB = teamB.stream().map(dto -> dto.toEntity(match, MatchUser.Team.TEAM_B)).toList();
+        match.teamA = teamA.stream().map(dto -> dto.toEntity(match, MatchUser.Team.TEAM_A, userService)).toList();
+        match.teamB = teamB.stream().map(dto -> dto.toEntity(match, MatchUser.Team.TEAM_B, userService)).toList();
         return match;
     }
 }

leaderboards/src/main/java/com/lunatech/leaderboard/dto/match/MatchPostDto.java

@@ -3,15 +3,18 @@
 import com.lunatech.leaderboard.entity.Match;
 import com.lunatech.leaderboard.entity.MatchUser;
 import com.lunatech.leaderboard.entity.User;
+import com.lunatech.leaderboard.service.UserService;
 
-public record MatchUserPostDto(Long userId) {
+public record MatchUserPostDto(String userEmail) {
 
-    public MatchUser toEntity(Match match, MatchUser.Team team) {
+    public MatchUser toEntity(Match match, MatchUser.Team team, UserService userService) {
         MatchUser matchUser = new MatchUser();
         matchUser.match = match;
         matchUser.team = team;
         matchUser.outcomeConfirmed = false;
-        matchUser.user = User.findById(userId);
+
+        matchUser.user = User.findByEmail(userEmail)
+                .orElseGet(() -> userService.add(userEmail));
         return matchUser;
     }
 }

leaderboards/src/main/java/com/lunatech/leaderboard/dto/matchuser/MatchUserPostDto.java

@@ -3,6 +3,7 @@
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 
 import javax.persistence.*;
+import java.util.Optional;
 
 @Entity
 @Table(name = "app_user")
@@ -22,4 +23,8 @@ public class User extends PanacheEntityBase {
 
     @Column(name = "profilepicurl")
     public String profilePicUrl;
+
+    public static Optional<User> findByEmail(String email) {
+        return find("email", email).firstResultOptional();
+    }
 }

leaderboards/src/main/java/com/lunatech/leaderboard/entity/User.java

@@ -1,47 +1,35 @@
 package com.lunatech.leaderboard.service;
 
 import com.lunatech.leaderboard.client.graphql.lunagraph.LunagraphApi;
-import com.lunatech.leaderboard.client.graphql.lunagraph.model.LunagraphEmployeeType;
-import com.lunatech.leaderboard.client.graphql.lunagraph.model.LunagraphPeopleModel;
+import com.lunatech.leaderboard.client.graphql.lunagraph.model.LunagraphPersonModel;
 import com.lunatech.leaderboard.entity.User;
-import io.quarkus.runtime.StartupEvent;
-import lombok.extern.java.Log;
+import io.smallrye.graphql.client.InvalidResponseException;
 
 import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
 import javax.inject.Inject;
-import java.util.Set;
-import java.util.stream.Collectors;
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.InternalServerErrorException;
 
 @ApplicationScoped
-@Log
 public class UserService {
 
     @Inject
     LunagraphApi lunagraphApi;
 
-    public void startUp(@Observes StartupEvent event) {
-        importAnniaUsers();
-    }
-
-    public void importAnniaUsers() {
+    public User add(String email) {
         try {
-            Set<String> usersEmails = User.<User>streamAll().map(user -> user.email).collect(Collectors.toSet());
-
-            LunagraphPeopleModel peopleModel = lunagraphApi.people(LunagraphEmployeeType.INTERNAL);
-            peopleModel.people().stream()
-                    .filter(person -> !usersEmails.contains(person.emailAddress()))
-                    .forEach(person -> add(person.emailAddress(), person.fullName()));
-        } catch (Exception e) {
-            log.severe(e.getMessage());
+            LunagraphPersonModel person = lunagraphApi.person(email);
+            if(person == null)
+                throw new BadRequestException("No user found for email " + email);
+
+            User user = new User();
+            user.email = email;
+            user.displayName = person.fullName();
+            user.persist();
+
+            return user;
+        } catch (InvalidResponseException e) {
+            throw new InternalServerErrorException("Something happened while trying to communicate with Lunagraph " + e.getMessage());
         }
     }
-
-    public User add(String emailAddress, String fullName) {
-        User user = new User();
-        user.email = emailAddress;
-        user.displayName = fullName;
-        user.persist();
-        return user;
-    }
 }

leaderboards/src/main/java/com/lunatech/leaderboard/scheduled/FetchUsersScheduler.java

@@ -15,7 +15,6 @@ quarkus:
 
   oidc-client:
     auth-server-url: http://localhost:8081/realms/Quarkus
-    client-id: leaderboards-backend
     credentials:
       secret: secret