#212 removed PlayerDao

kagemomiji · Oct 8, 2023 · 5ee6730 · 5ee6730
1 parent 3ce3e55
commit 5ee6730
Show file tree

Hide file tree

Showing 6 changed files with 258 additions and 371 deletions.
diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/PlayerDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/PlayerDao.java
diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/Player.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Player.java
@@ -77,7 +77,7 @@ public class Player {
     @Enumerated(EnumType.STRING)
     private TranscodeScheme transcodeScheme = TranscodeScheme.OFF;
 
-    @ManyToMany(cascade = CascadeType.REMOVE, fetch = FetchType.LAZY)
+    @ManyToMany(fetch = FetchType.LAZY)
     @JoinTable(
         name = "player_transcoding",
         joinColumns = {@JoinColumn(name = "player_id")},

diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java
@@ -175,7 +175,7 @@ public synchronized Player getPlayer(HttpServletRequest request, HttpServletResp
             player = new Player();
             player.setLastSeen(Instant.now());
             populatePlayer(player, username, request, isStreamRequest);
-            createPlayer(player);
+            player = createPlayer(player);
         } else if (populatePlayer(player, username, request, isStreamRequest)) {
             updatePlayer(player);
         }
@@ -398,8 +398,7 @@ public Player clonePlayer(int playerId) {
         if (player.getName() != null) {
             clone.setName(player.getName() + " (copy)");
         }
-        createPlayer(clone);
-        return clone;
+        return createPlayer(clone);
     }
 
 
@@ -408,7 +407,7 @@ public Player clonePlayer(int playerId) {
      *
      * @param player The player to create.
      */
-    public void createPlayer(Player player) {
+    public Player createPlayer(Player player) {
 
         // Set default transcodings.
         List<Transcoding> defaultActiveTranscodings = transcodingRepository.findByDefaultActiveTrue();
@@ -444,6 +443,7 @@ public void createPlayer(Player player) {
             asyncWebSocketClient.sendToUser(saved.getUsername(), "/queue/players/created",
                     ImmutableMap.of("id", saved.getId(), "description", saved.getShortDescription(), "tech", saved.getTechnology()));
         }
+        return saved;
     }
 
     /**
@@ -463,9 +463,7 @@ public Player getGuestPlayer(String remoteAddress) {
             player.setIpAddress(remoteAddress);
         }
         player.setUsername(User.USERNAME_GUEST);
-        createPlayer(player);
-
-        return player;
+        return createPlayer(player);
     }
 
     /**