From 05776f19f38f5a716550f92b633147af09a5467e Mon Sep 17 00:00:00 2001
From: Andrew nuark G <mrcluster@ya.ru>
Date: Wed, 23 Dec 2020 01:30:11 +0700
Subject: [PATCH] Entities update

---
 sea_transport/adminpanel.ui              | 2 +-
 sea_transport/entities/dpoint_entity.cpp | 8 ++++++--
 sea_transport/entities/dpoint_entity.h   | 4 +++-
 sea_transport/entities/vessel_entity.cpp | 4 ++++
 sea_transport/entities/vessel_entity.h   | 1 +
 st_test/tst_st_test.cpp                  | 6 +++---
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/sea_transport/adminpanel.ui b/sea_transport/adminpanel.ui
index cc86acc..ac236f6 100644
--- a/sea_transport/adminpanel.ui
+++ b/sea_transport/adminpanel.ui
@@ -53,7 +53,7 @@
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>2</number>
+       <number>0</number>
       </property>
       <property name="documentMode">
        <bool>false</bool>
diff --git a/sea_transport/entities/dpoint_entity.cpp b/sea_transport/entities/dpoint_entity.cpp
index abc256a..ed5b926 100644
--- a/sea_transport/entities/dpoint_entity.cpp
+++ b/sea_transport/entities/dpoint_entity.cpp
@@ -1,7 +1,7 @@
 #include "dpoint_entity.h"
 
-dpoint_entity::dpoint_entity(const QString &title) : _title(title) {
-    this->_id = 0;
+dpoint_entity::dpoint_entity(entity_id dispatcher_id, const QString &title) : _dispatcher_id(dispatcher_id), _title(title) {
+    this->_id = dispatcher_id;
     auto hash = QCryptographicHash::hash(title.toLocal8Bit(), QCryptographicHash::Md5);
     for (auto bit : hash) {
         this->_id += bit;
@@ -12,6 +12,10 @@ entity_id dpoint_entity::id() const {
     return this->_id;
 }
 
+entity_id dpoint_entity::dispatcher() const {
+    return this->_dispatcher_id;
+}
+
 QString dpoint_entity::title() const {
     return this->_title;
 }
diff --git a/sea_transport/entities/dpoint_entity.h b/sea_transport/entities/dpoint_entity.h
index 037f8ff..90fb4a4 100644
--- a/sea_transport/entities/dpoint_entity.h
+++ b/sea_transport/entities/dpoint_entity.h
@@ -12,14 +12,16 @@
 class dpoint_entity : public IEntity {
 private:
     entity_id _id;
+    entity_id _dispatcher_id;
     QString _title;
     QVector<storage_entity> _storages;
 
 public:
     dpoint_entity() = default;
-    dpoint_entity(const QString &title);
+    dpoint_entity(entity_id dispatcher_id, const QString &title);
 
     entity_id id() const;
+    entity_id dispatcher() const;
     QString title() const;
     const QVector<storage_entity> storages();
 
diff --git a/sea_transport/entities/vessel_entity.cpp b/sea_transport/entities/vessel_entity.cpp
index e3bd829..45ce0a0 100644
--- a/sea_transport/entities/vessel_entity.cpp
+++ b/sea_transport/entities/vessel_entity.cpp
@@ -11,6 +11,10 @@ entity_id vessel_entity::id() const {
     return this->_id;
 }
 
+entity_id vessel_entity::skipper() const {
+    return this->_skipper_id;
+}
+
 entity_id vessel_entity::harbor() const {
     return this->_harbor_id;
 }
diff --git a/sea_transport/entities/vessel_entity.h b/sea_transport/entities/vessel_entity.h
index 22a1c7c..9b72c90 100644
--- a/sea_transport/entities/vessel_entity.h
+++ b/sea_transport/entities/vessel_entity.h
@@ -21,6 +21,7 @@ public:
     vessel_entity(entity_id skipper_id, entity_id harbor_id, unsigned int capacity);
 
     entity_id id() const;
+    entity_id skipper() const;
     entity_id harbor() const;
     unsigned int capacity() const;
     const QVector<cargo_entity> cargo();
diff --git a/st_test/tst_st_test.cpp b/st_test/tst_st_test.cpp
index 6cfc350..3c8ca78 100644
--- a/st_test/tst_st_test.cpp
+++ b/st_test/tst_st_test.cpp
@@ -164,8 +164,8 @@ void st_test::vessel_entity_serialization_test() {
         f.open(QIODevice::WriteOnly);
         stream.setDevice(&f);
 
-        dpoint_entity test_harbor("test_harbor_for_vessel");
-        ent1 = vessel_entity(test_harbor.id(), 256);
+        dpoint_entity test_harbor(0, "test_harbor_for_vessel");
+        ent1 = vessel_entity(0, test_harbor.id(), 256);
         ent1.serialize(stream);
 
         stream.setDevice(nullptr);
@@ -265,7 +265,7 @@ void st_test::apparatus_check_auth_subsystem() {
 void st_test::apparatus_check_object_subsystem() {
     apparatus::init();
     auto os = apparatus::instance()->get_object_subsystem();
-    dpoint_entity p("test");
+    dpoint_entity p(0, "test");
     {
         bool test = os->add_dpoint(p);
         QVERIFY(test);