From 2cd50af843cee189248f803a0e9e9255a45a2cbf Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Thu, 3 Nov 2022 00:58:05 -0500
Subject: [PATCH] Fixing data import not preserving currency.

---
 .../java/com/gempukku/lotro/db/DbCollectionDAO.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbCollectionDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbCollectionDAO.java
index 54e788216..d1ae0e8cb 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbCollectionDAO.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbCollectionDAO.java
@@ -3,6 +3,8 @@ package com.gempukku.lotro.db;
 import com.gempukku.lotro.collection.CollectionSerializer;
 import com.gempukku.lotro.common.DBDefs;
 import com.gempukku.lotro.game.CardCollection;
+import com.gempukku.lotro.game.DefaultCardCollection;
+import com.gempukku.lotro.game.MutableCardCollection;
 import org.json.simple.JSONObject;
 import org.sql2o.Query;
 import org.sql2o.Sql2o;
@@ -231,11 +233,14 @@ public class DbCollectionDAO implements CollectionDAO {
     }
 
     public void convertCollection(int playerId, String type) throws SQLException, IOException {
-        CardCollection oldCollection = getOldPlayerCollection(playerId, type);
+        MutableCardCollection oldCollection = getOldPlayerCollection(playerId, type);
+        var oldinfo = oldCollection.getExtraInformation();
+        oldinfo.put(DefaultCardCollection.CurrencyKey, oldCollection.getCurrency());
+        oldCollection.setExtraInformation(oldinfo);
         overwriteCollectionContents(playerId, type, oldCollection, "Initial Convert");
     }
 
-    public CardCollection getOldPlayerCollection(int playerId, String type) throws SQLException, IOException {
+    public MutableCardCollection getOldPlayerCollection(int playerId, String type) throws SQLException, IOException {
         try (Connection connection = _dbAccess.getDataSource().getConnection()) {
             try (PreparedStatement statement = connection.prepareStatement("select collection from collection where player_id=? and type=?")) {
                 statement.setInt(1, playerId);
@@ -252,7 +257,7 @@ public class DbCollectionDAO implements CollectionDAO {
         }
     }
 
-    private CardCollection extractCollectionAndClose(Blob blob) throws SQLException, IOException {
+    private MutableCardCollection extractCollectionAndClose(Blob blob) throws SQLException, IOException {
         try {
             try (InputStream inputStream = blob.getBinaryStream()) {
                 return _collectionSerializer.deserializeCollection(inputStream);