Changeset 23459

Timestamp:

2014/05/29 14:40:57 (8 years ago)

Author:

pineray

Message:

#2515 無駄な処理を改善する for 2.13.3

カテゴリーID取得部分の処理を整理.

Location:

branches/version-2_13-dev/data/class

Files:

• SC_Product.php (modified) (2 diffs)
• helper/SC_Helper_Category.php (modified) (1 diff)
• helper/SC_Helper_DB.php (modified) (1 diff)
• pages/admin/products/LC_Page_Admin_Products.php (modified) (1 diff)
• pages/products/LC_Page_Products_List.php (modified) (2 diffs)

branches/version-2_13-dev/data/class/SC_Product.php

@@ -696 +696 @@
      */
     public function getCategoryIds($product_id, $include_hidden = false) {
-        if ($include_hidden) {
-            $where = '';
-        } else {
-            $where = 'status = 1';
-        }
-
-        if (SC_Utils_Ex::sfIsInt($product_id) && $product_id != 0 && SC_Helper_DB_Ex::sfIsRecord('dtb_products','product_id', array($product_id), $where)) {
+        if ($this->isValidProductId($product_id, $include_hidden)) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
             $category_id = $objQuery->getCol('category_id', 'dtb_product_categories', 'product_id = ?', array($product_id));
@@ -712 +706 @@
         return $category_id;
     }
+
+    /**
+     * 有効な商品IDかチェックする.
+     *
+     * @param int $product_id
+     * @param bool $include_hidden
+     * @param bool $include_deleted
+     * @return bool
+     */
+    public function isValidProductId($product_id, $include_hidden = false, $include_deleted = false) {
+        $where = '';
+        if (!$include_hidden) {
+            $where .= ' status = 1';
+        }
+        if (!$include_deleted) {
+            $where .= ' del_flg = 0';
+        }
+        if (
+            SC_Utils_Ex::sfIsInt($product_id)
+            && !SC_Utils_Ex::sfIsZeroFilling($product_id)
+            && SC_Helper_DB_Ex::sfIsRecord('dtb_products','product_id', array($product_id), $where)
+        ) {
+            return true;
+        }
+        return false;
+    }
 }

branches/version-2_13-dev/data/class/helper/SC_Helper_Category.php

@@ -397 +397 @@
         return $objQuery->update($table, array(), $where, array(), $arrRawVal);
     }
+
+    /**
+     * 有効なカテゴリーIDかチェックする.
+     *
+     * @param int $category_id
+     * @param bool $include_deleted
+     * @return bool
+     */
+    public function isValidCategoryId($category_id, $include_deleted = false) {
+        if ($include_deleted) {
+            $where = '';
+        } else {
+            $where = 'del_flg = 0';
+        }
+        if (
+            SC_Utils_Ex::sfIsInt($category_id)
+            && !SC_Utils_Ex::sfIsZeroFilling($category_id)
+            && SC_Helper_DB_Ex::sfIsRecord('dtb_category','category_id', array($category_id), $where)
+        ) {
+            return true;
+        }
+        return false;
+    }
 }

branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php

@@ -524 +524 @@
         $category_id = (int) $category_id;
         $product_id = (int) $product_id;
-        if (SC_Utils_Ex::sfIsInt($category_id) && $category_id != 0 && SC_Helper_DB_Ex::sfIsRecord('dtb_category','category_id', array($category_id))) {
+        $objCategory = new SC_Helper_Category_Ex();
+        if ($objCategory->isValidCategoryId($category_id, $closed)) {
             $category_id = array($category_id);
         } else {

branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php

@@ -164 +164 @@
                             if (count($this->arrProducts) > 0) {
                                 foreach ($this->arrProducts as $key => $val) {
-                                    $this->arrProducts[$key]['categories'] = $objDb->sfGetCategoryId($val['product_id'], 0, true);
+                                    $this->arrProducts[$key]['categories'] = $objProduct->getCategoryIds($val['product_id'], true);
                                     $objDb->g_category_on = false;
                                 }

branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php

@@ -185 +185 @@
      * カテゴリIDの取得
      *
-     * @return integer カテゴリID
+     * @param int $category_id
+     * @return integer|void カテゴリID
      */
     public function lfGetCategoryId($category_id)
@@ -193 +194 @@
 
         // 正当性チェック
-        if (!SC_Utils_Ex::sfIsInt($category_id)
-            || SC_Utils_Ex::sfIsZeroFilling($category_id)
-            || !SC_Helper_DB_Ex::sfIsRecord('dtb_category', 'category_id', (array) $category_id, 'del_flg = 0')
-            ) {
+        $objCategory = new SC_Helper_Category_Ex();
+        if ($objCategory->isValidCategoryId($category_id)) {
+            return $category_id;
+        } else {
             SC_Utils_Ex::sfDispSiteError(CATEGORY_NOT_FOUND);
         }
-
-        // 指定されたカテゴリIDを元に正しいカテゴリIDを取得する。
-        $arrCategory_id = SC_Helper_DB_Ex::sfGetCategoryId('', $category_id);
-
-        if (empty($arrCategory_id)) {
-            SC_Utils_Ex::sfDispSiteError(CATEGORY_NOT_FOUND);
-        }
-
-        return $arrCategory_id[0];
     }