serialization is done

Author: Add-JDHero

sprint4/problems/leave_game/solution/src/application.cpp

@@ -195,7 +195,7 @@ namespace app {
         }
     }
 
-    Application::Application(model::Game& game) 
+Application::Application(model::Game& game) 
         : game_(game) {
     }
 

sprint4/problems/leave_game/solution/src/application.h

@@ -324,7 +324,6 @@ namespace app_serialization {
         void serialize(Archive& ar, [[maybe_unused]] const unsigned version) {
             std::cout << "Serializing players, count: " << players_.size() << std::endl;
             ar & players_;
-            ar & players_;
             ar & dog_ids_;
         }
 

sprint4/problems/leave_game/solution/src/copy_server_state.txt

@@ -102,7 +102,7 @@ using namespace std::literals;
     Dog::Dog(State state, std::string name)
         : state_(std::move(state))
         , name_(std::move(name)) {
-        general_id_++;
+        
     }
 
     Dog::Dog(std::string_view name) : name_(std::string(name)) {
@@ -173,6 +173,15 @@ using namespace std::literals;
         return state_;
     }
 
+    void SessionService::ConfigureSessionData(std::shared_ptr<GameSession> session) {
+        int index = common_data_->sessions_.size();
+
+        common_data_->sessions_.push_back(session);
+        common_data_->game_sessions_id_to_index_[session->GetSessionId()] = index;
+        common_data_->mapId_to_session_index_[session->GetMapId()] = 
+            session->GetSessionId();
+    } 
+
     std::shared_ptr<GameSession> SessionService::CreateGameSession(Map::Id map_id) {
         auto& map = common_data_->maps_[common_data_->map_id_to_index_[map_id]];
 
@@ -191,10 +200,7 @@ using namespace std::literals;
         // Создаём GameSession с lootId_to_value_
         auto result = std::make_shared<GameSession>(map, std::move(type_to_loot_values));
 
-        int index = common_data_->sessions_.size();
-        common_data_->sessions_.push_back(result);
-        common_data_->game_sessions_id_to_index_[result->GetSessionId()] = index;
-        common_data_->mapId_to_session_index_[map_id] = result->GetSessionId();
+        ConfigureSessionData(result);
 
         return result;
     }
@@ -204,8 +210,9 @@ using namespace std::literals;
         , bag_capacity_(map.GetBagCapacity())
         , lootId_to_value_(std::move(loot_values)) {
             if (!is_deserialized) {
-                id_= general_id_++;
+                id_= general_id_;
             }
+            general_id_++;
         InitializeRegions(map_, regions_);
     }
 

sprint4/problems/leave_game/solution/src/model.cpp

@@ -474,7 +474,7 @@ namespace model {
         std::shared_ptr<model::GameSession> FindGameSession(model::GameSession::Id session_id) const {
             auto it = common_data_->sessions_[common_data_->game_sessions_id_to_index_[session_id]];
 
-            return std::make_shared<model::GameSession>(*it);
+            return it;
         }
 
         std::shared_ptr<GameSession> 
@@ -483,6 +483,8 @@ namespace model {
         void Tick(std::chrono::milliseconds delta_time);
 
     private:
+            void ConfigureSessionData(std::shared_ptr<GameSession> session);
+
         std::shared_ptr<CommonData> common_data_;
     };
 

sprint4/problems/leave_game/solution/src/model.h

@@ -352,7 +352,7 @@ namespace serialization {
 
             for (const auto& session : data.sessions_) {
                 auto index = data.map_id_to_index_.at(session->GetMapId());
-                sessions_.emplace_back(*session, data.maps_[index]);
+                sessions_.push_back(GameSessionSer(*session, data.maps_[index]));
             }
 
             for (const auto& [map_id, loot_ptr] : data.mapId_to_lootTypes_) {

sprint4/problems/leave_game/solution/src/model_serialization.h

@@ -5,6 +5,7 @@
 #include "application.h"
 #include "extra_data.h"
 
+#include <boost/json/serialize.hpp>
 #include <chrono>
 #include <cstdint>
 #include <exception>
@@ -458,6 +459,7 @@ namespace http_handler {
         }
 
         auto response_body = app_.GetSerializedGameState(app::Token{token});
+
         return json_response(http::status::ok, std::move(response_body), ContentType::APP_JSON);
     }
 

sprint4/problems/leave_game/solution/src/request_handler.cpp

@@ -1,3 +1,3 @@
-22 serialization::archive 19 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 4 map3 5 Map 3 3 0 0 9 0 0 0 0 0 2 2 2 16 12 7 12 0 20 0 20 14 14 16 14 14 8 7 8 14 2 7 20 7 12 0 20 0 20 14 8 14 2 16 14 16 0 0 5 0 0 0 0 0 4 2 0 0 6 3 14 2 4 3 4 9 2 5 9 9 4 3 14 9 4 3 0 0 1 0 0 0 0 0 2 o1 8 14 0 0 1 -1 3.00000000000000000e+00 0 0 2 13 0 0 0 0 10 1 30 0 0 1 1 0 1 22 1 0
-0 3 Dog 0 0 0 0 1.11050000000000093e+01 7.15999999999999837e+00 0 0 0.00000000000000000e+00 0.00000000000000000e+00 3 70 0 0 0 1 0 0 0 3 0 3.00000000000000000e+00 0 0 1 0 0 0 4 1 1.39636870409646825e+01 1.53526592749417876e+01 5 0 0 0 1 13 0 0 0 0 0 0 0 3 13 0 0 0 4 map3 0 0 2 0 107 {"name":"key","file":"assets/key.obj","type":"obj","rotation":90,"color":"#338844","scale":3E-2,"value":10} 112 {"name":"wallet","file":"assets/wallet.obj","type":"obj","rotation":0,"color":"#883344","scale":1E-2,"value":30} 4 town 2 0 107 {"name":"key","file":"assets/key.obj","type":"obj","rotation":90,"color":"#338844","scale":3E-2,"value":10} 107 {"name":"key","file":"assets/key.obj","type":"obj","rotation":90,"color":"#338844","scale":3E-2,"value":10} 4 map1 2 0 107 {"name":"key","file":"assets/key.obj","type":"obj","rotation":90,"color":"#338844","scale":3E-2,"value":10} 112 {"name":"wallet","file":"assets/wallet.obj","type":"obj","rotation":0,"color":"#883344","scale":1E-2,"value":30} 0 0 1 13 0 0 0 4 map3 0 0 0 3 0 4 map1 5 Map 1 3 4 0 0 0 40 0 40 0 40 30 40 30 0 30 0 0 0 30 1 0 5 5 30 20 1 0 2 o0 40 30 5 0 4.00000000000000000e+00 4 town 4 Town 3 22 0 0 0 40 0 40 0 40 30 40 30 0 30 0 15 40 15 20 0 20 30 0 22 17 22 17 18 17 27 10 22 10 30 0 10 10 10 10 10 10 5 10 5 20 5 20 30 20 40 20 40 10 40 20 40 30 40 30 0 30 10 20 25 25 25 30 25 30 30 20 20 25 20 30 15 30 20 35 20 40 20 40 25 35 25 30 30 30 35 20 0 2 2 6 6 12 7 6 6 22 2 6 11 32 2 6 11 22 16 4 3 33 16 4 3 34 21 4 3 22 21 4 3 22 26 5 3 34 26 5 3 28 21 4 3 2 16 5 5 9 16 6 3 12 24 3 4 2 24 6 4 12 1 7 2 11 34 4 4 22 31 6 2 22 35 6 4 17 41 7 4 1 0 2 o0 40 30 5 0 3.00000000000000000e+00 4 map3 5 Map 3 3 9 0 2 2 2 16 12 7 12 0 20 0 20 14 14 16 14 14 8 7 8 14 2 7 20 7 12 0 20 0 20 14 8 14 2 16 14 16 5 0 4 2 6 3 14 2 4 3 4 9 2 5 9 9 4 3 14 9 4 3 1 0 2 o1 8 14 1 -1 3.00000000000000000e+00 3 13 0 4 map1 0 4 town 1 4 map3 2 3.00000000000000000e+00 1.00000000000000000e+01 0 0 0 0 1 0 0 0
-1 3 Dog 1.11050000000000093e+01 7.15999999999999837e+00 0.00000000000000000e+00 0.00000000000000000e+00 3 70 0 1 0 3 0 3.00000000000000000e+00 0 1 0 1 0 1 0 0
+22 serialization::archive 19 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 4 map3 5 Map 3 3 0 0 9 0 0 0 0 0 2 2 2 16 12 7 12 0 20 0 20 14 14 16 14 14 8 7 8 14 2 7 20 7 12 0 20 0 20 14 8 14 2 16 14 16 0 0 5 0 0 0 0 0 4 2 0 0 6 3 14 2 4 3 4 9 2 5 9 9 4 3 14 9 4 3 0 0 1 0 0 0 0 0 2 o1 8 14 0 0 1 -1 3.00000000000000000e+00 0 0 2 13 0 0 0 1 30 0 10 0 0 1 1 0 1 22 1 0
+0 3 Dog 0 0 0 0 1.87059999999999924e+01 -1.72999999999926407e-01 0 0 0.00000000000000000e+00 0.00000000000000000e+00 2 180 0 0 0 1 0 0 0 16 0 3.00000000000000000e+00 0 0 1 0 0 0 17 0 1.42480060931481507e+01 1.42766721016293765e+01 18 0 4 map1 5 Map 1 3 4 0 0 0 40 0 40 0 40 30 40 30 0 30 0 0 0 30 1 0 5 5 30 20 1 0 2 o0 40 30 5 0 4.00000000000000000e+00 2 13 0 1 30 0 10 0 1 1 0 8 1 1.91040078574823333e+01 -2.32130725693235646e-01 18 1 0 0 2 13 0 0 0 1 1 0 0 0 0 3 13 0 0 0 4 map1 0 0 2 0 107 {"name":"key","file":"assets/key.obj","type":"obj","rotation":90,"color":"#338844","scale":3E-2,"value":10} 112 {"name":"wallet","file":"assets/wallet.obj","type":"obj","rotation":0,"color":"#883344","scale":1E-2,"value":30} 4 town 2 0 107 {"name":"key","file":"assets/key.obj","type":"obj","rotation":90,"color":"#338844","scale":3E-2,"value":10} 107 {"name":"key","file":"assets/key.obj","type":"obj","rotation":90,"color":"#338844","scale":3E-2,"value":10} 4 map3 2 0 107 {"name":"key","file":"assets/key.obj","type":"obj","rotation":90,"color":"#338844","scale":3E-2,"value":10} 112 {"name":"wallet","file":"assets/wallet.obj","type":"obj","rotation":0,"color":"#883344","scale":1E-2,"value":30} 0 0 2 13 0 0 0 4 map1 1 4 map3 0 0 0 3 0 4 map1 5 Map 1 3 4 0 0 0 40 0 40 0 40 30 40 30 0 30 0 0 0 30 1 0 5 5 30 20 1 0 2 o0 40 30 5 0 4.00000000000000000e+00 4 town 4 Town 3 22 0 0 0 40 0 40 0 40 30 40 30 0 30 0 15 40 15 20 0 20 30 0 22 17 22 17 18 17 27 10 22 10 30 0 10 10 10 10 10 10 5 10 5 20 5 20 30 20 40 20 40 10 40 20 40 30 40 30 0 30 10 20 25 25 25 30 25 30 30 20 20 25 20 30 15 30 20 35 20 40 20 40 25 35 25 30 30 30 35 20 0 2 2 6 6 12 7 6 6 22 2 6 11 32 2 6 11 22 16 4 3 33 16 4 3 34 21 4 3 22 21 4 3 22 26 5 3 34 26 5 3 28 21 4 3 2 16 5 5 9 16 6 3 12 24 3 4 2 24 6 4 12 1 7 2 11 34 4 4 22 31 6 2 22 35 6 4 17 41 7 4 1 0 2 o0 40 30 5 0 3.00000000000000000e+00 4 map3 5 Map 3 3 9 0 2 2 2 16 12 7 12 0 20 0 20 14 14 16 14 14 8 7 8 14 2 7 20 7 12 0 20 0 20 14 8 14 2 16 14 16 5 0 4 2 6 3 14 2 4 3 4 9 2 5 9 9 4 3 14 9 4 3 1 0 2 o1 8 14 1 -1 3.00000000000000000e+00 3 13 0 4 map3 2 4 town 1 4 map1 0 3.00000000000000000e+00 1.00000000000000000e+01 0 0 0 0 1 0 0 0
+1 3 Dog 1.87059999999999924e+01 -1.72999999999926407e-01 0.00000000000000000e+00 0.00000000000000000e+00 2 180 0 1 0 16 0 3.00000000000000000e+00 0 1 0 0