Add period belong to DAO calendar check

hypha-dao · Aug 31, 2023 · 6c7fe87 · 6c7fe87
1 parent 127c779
commit 6c7fe87
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/src/dao.cpp b/src/dao.cpp
@@ -1723,7 +1723,7 @@ ACTION dao::initcalendar(uint64_t calendar_id, uint64_t next_period)
     Edge(get_self(), get_self(), calendar_id, next_period, common::START);
   }
 
-  const size_t MAX_ITS_PER_ACTION = 40;
+  const size_t MAX_ITS_PER_ACTION = 50;
 
   size_t i = 0;
 

diff --git a/src/proposals/assignment_proposal.cpp b/src/proposals/assignment_proposal.cpp
@@ -120,16 +120,19 @@ namespace hypha
                 static_cast<uint64_t>(startPeriod->getAs<int64_t>()),
                 common::PERIOD
             );
+
             // EOS_CHECK(
             //     period.getStartTime().sec_since_epoch() >= eosio::current_time_point().sec_since_epoch(),
             //     "Only future periods are allowed for starting period"
             // )
 
+            auto calendarId = Edge::get(m_dao.get_self(), period.getID(), common::CALENDAR).getToNode();
+
             //TODO Period: Remove since period refactor will no longer point to DAO
-            // EOS_CHECK(
-            //     Edge::exists(m_dao.get_self(), period.getID(), m_daoID, common::DAO),
-            //     "Period must belong to the DAO"
-            // );
+            EOS_CHECK(
+                Edge::exists(m_dao.get_self(), m_daoID, calendarId, common::CALENDAR),
+                "Period must belong to the DAO"
+            );
         } else {
             // default START_PERIOD to next period
             ContentWrapper::insertOrReplace(

diff --git a/src/proposals/badge_assignment_proposal.cpp b/src/proposals/badge_assignment_proposal.cpp
@@ -194,11 +194,13 @@ namespace hypha
                 common::PERIOD
             );
 
+            auto calendarId = Edge::get(m_dao.get_self(), period.getID(), common::CALENDAR).getToNode();
+
             //TODO Period: Remove since period refactor will no longer point to DAO
-            // EOS_CHECK(
-            //     Edge::exists(m_dao.get_self(), period.getID(), m_daoID, common::DAO),
-            //     "Period must belong to the DAO"
-            // );
+            EOS_CHECK(
+                Edge::exists(m_dao.get_self(), m_daoID, calendarId, common::CALENDAR),
+                "Period must belong to the DAO"
+            );
         } 
         else {
             // default START_PERIOD to next period

diff --git a/src/proposals/quest_start_proposal.cpp b/src/proposals/quest_start_proposal.cpp
@@ -42,9 +42,11 @@ namespace hypha
         //Check start period
         Document period = getItemDoc(START_PERIOD, common::PERIOD, cw);
 
+        auto calendarId = Edge::get(m_dao.get_self(), period.getID(), common::CALENDAR).getToNode();
+
         //TODO Period: Remove since period refactor will no longer point to DAO
         EOS_CHECK(
-            Edge::exists(m_dao.get_self(), period.getID(), m_daoID, common::DAO),
+            Edge::exists(m_dao.get_self(), m_daoID, calendarId, common::CALENDAR),
             "Period must belong to the DAO"
         );