Refactor allocation of objects and published check

Author: carlbennett

src/controllers/User/View.php

@@ -82,7 +82,8 @@ protected function getUserInfo(UserViewModel &$model)
     );
 
     // Process documents
-    if ($model->documents) {
+    if ($model->documents)
+    {
       // Alphabetically sort the documents
       usort($model->documents, function($a, $b){
         $a1 = $a->getTitle();
@@ -93,17 +94,19 @@ protected function getUserInfo(UserViewModel &$model)
 
       // Remove documents that are not published
       $i = count($model->documents) - 1;
-      while ($i >= 0) {
-        if (!($model->documents[$i]->getOptionsBitmask()
-          & Document::OPTION_PUBLISHED)) {
+      while ($i >= 0)
+      {
+        if (!($model->documents[$i]->isPublished()))
+        {
           unset($model->documents[$i]);
         }
         --$i;
       }
     }
 
     // Process news posts
-    if ($model->news_posts) {
+    if ($model->news_posts)
+    {
       // Alphabetically sort the news posts
       usort($model->news_posts, function($a, $b){
         $a1 = $a->getTitle();
@@ -114,17 +117,19 @@ protected function getUserInfo(UserViewModel &$model)
 
       // Remove news posts that are not published
       $i = count($model->news_posts) - 1;
-      while ($i >= 0) {
-        if (!($model->news_posts[$i]->getOptionsBitmask()
-          & NewsPost::OPTION_PUBLISHED)) {
+      while ($i >= 0)
+      {
+        if (!($model->news_posts[$i]->isPublished()))
+        {
           unset($model->news_posts[$i]);
         }
         --$i;
       }
     }
 
     // Process packets
-    if ($model->packets) {
+    if ($model->packets)
+    {
       // Alphabetically sort the packets
       usort($model->packets, function($a, $b){
         $a1 = $a->getName();
@@ -135,9 +140,10 @@ protected function getUserInfo(UserViewModel &$model)
 
       // Remove packets that are not published
       $i = count($model->packets) - 1;
-      while ($i >= 0) {
-        if (!($model->packets[$i]->getOptionsBitmask()
-          & Packet::OPTION_PUBLISHED)) {
+      while ($i >= 0)
+      {
+        if (!($model->packets[$i]->isPublished()))
+        {
           unset($model->packets[$i]);
         }
         --$i;

src/libraries/Packet.php

@@ -201,7 +201,6 @@ protected function allocateObject(StdClass $value)
     $this->setRemarks($value->packet_remarks);
     $this->setTransportLayerId($value->packet_transport_layer_id);
     $this->setUserId($value->user_id);
-    if (!isset($value->used_by)) throw new \RuntimeException();
     $this->setUsedBy($value->used_by);
   }
 
@@ -342,31 +341,14 @@ public static function &getAllPackets(?string $where_clause = null, ?array $orde
       Common::$database = DatabaseDriver::getDatabaseObject();
     }
 
-    $q = Common::$database->prepare(sprintf('
-      SELECT
-        `created_datetime`,
-        `edited_count`,
-        `edited_datetime`,
-        `id`,
-        `options_bitmask`,
-        `packet_application_layer_id`,
-        `packet_direction_id`,
-        `packet_format`,
-        `packet_id`,
-        `packet_name`,
-        `packet_remarks`,
-        `packet_transport_layer_id`,
-        `user_id`
-      FROM `packets` %s ORDER BY %s;', $where_clause, $order_clause
-    ));
-
+    $q = Common::$database->prepare(sprintf('SELECT `id` FROM `packets` %s ORDER BY %s;', $where_clause, $order_clause));
     $r = $q->execute();
     if (!$r) return $r;
 
     $r = [];
-    while ($row = $q->fetch(PDO::FETCH_OBJ))
+    while ($row = $q->fetch(PDO::FETCH_NUM))
     {
-      $r[] = new self($row);
+      $r[] = new self($row[0]);
     }
 
     $q->closeCursor();
@@ -383,7 +365,6 @@ public static function getPacketsByLastEdited(int $count)
     $q = Common::$database->prepare(sprintf(
       'SELECT `id` FROM `packets` ORDER BY IFNULL(`edited_datetime`, `created_datetime`) DESC LIMIT %d;', $count
     ));
-
     $r = $q->execute();
     if (!$r) return $r;
 
@@ -533,34 +514,15 @@ public static function getPacketsByUserId(int $user_id)
       Common::$database = DatabaseDriver::getDatabaseObject();
     }
 
-    $q = Common::$database->prepare('
-      SELECT
-        `created_datetime`,
-        `edited_count`,
-        `edited_datetime`,
-        `id`,
-        `options_bitmask`,
-        `packet_application_layer_id`,
-        `packet_direction_id`,
-        `packet_format`,
-        `packet_id`,
-        `packet_name`,
-        `packet_remarks`,
-        `packet_transport_layer_id`,
-        `user_id`
-      FROM `packets`
-      WHERE `user_id` = :user_id
-      ORDER BY `id` ASC;
-    ');
-    $q->bindParam(':user_id', $user_id, PDO::PARAM_INT);
-
+    $q = Common::$database->prepare('SELECT `id` FROM `packets` WHERE `user_id` = :id ORDER BY `id` ASC;');
+    $q->bindParam(':id', $user_id, PDO::PARAM_INT);
     $r = $q->execute();
     if (!$r) return $r;
 
     $r = [];
-    while ($row = $q->fetch(PDO::FETCH_OBJ))
+    while ($row = $q->fetch(PDO::FETCH_NUM))
     {
-      $r[] = new self( $row );
+      $r[] = new self($row[0]);
     }
 
     $q->closeCursor();