Category::level -> Category::hierarchy

nanasess · Sep 26, 2017 · 411def6 · 411def6
1 parent 29abdba
commit 411def6
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git a/src/Eccube/Controller/Admin/Product/CategoryController.php b/src/Eccube/Controller/Admin/Product/CategoryController.php
@@ -113,9 +113,9 @@ public function index(Application $app, Request $request, $parent_id = null, $id
             $TargetCategory = new \Eccube\Entity\Category();
             $TargetCategory->setParent($Parent);
             if ($Parent) {
-                $TargetCategory->setLevel($Parent->getLevel() + 1);
+                $TargetCategory->setHierarchy($Parent->getHierarchy() + 1);
             } else {
-                $TargetCategory->setLevel(1);
+                $TargetCategory->setHierarchy(1);
             }
         }
 
@@ -139,7 +139,7 @@ public function index(Application $app, Request $request, $parent_id = null, $id
         if ($request->getMethod() === 'POST') {
             $form->handleRequest($request);
             if ($form->isValid()) {
-                if ($this->appConfig['category_nest_level'] < $TargetCategory->getLevel()) {
+                if ($this->appConfig['category_nest_level'] < $TargetCategory->getHierarchy()) {
                     throw new BadRequestHttpException('リクエストが不正です');
                 }
                 log_info('カテゴリ登録開始', array($id));

diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php
@@ -582,12 +582,12 @@ public function csvCategory(Application $app, Request $request)
 
                         $Category->setParent($ParentCategory);
                         if ($ParentCategory) {
-                            $Category->setLevel($ParentCategory->getLevel() + 1);
+                            $Category->setHierarchy($ParentCategory->getHierarchy() + 1);
                         } else {
-                            $Category->setLevel(1);
+                            $Category->setHierarchy(1);
                         }
 
-                        if ($this->appConfig['category_nest_level'] < $Category->getLevel()) {
+                        if ($this->appConfig['category_nest_level'] < $Category->getHierarchy()) {
                             $this->addErrors(($data->key() + 1) . '行目のカテゴリが最大レベルを超えているため設定できません。');
                             return $this->render($app, $form, $headers);
                         }

diff --git a/src/Eccube/Entity/Category.php b/src/Eccube/Entity/Category.php
@@ -105,7 +105,7 @@ public function getPath()
 
     public function getNameWithLevel()
     {
-        return str_repeat('　', $this->getLevel() - 1) . $this->getName();
+        return str_repeat('　', $this->getHierarchy() - 1) . $this->getName();
     }
 
     public function getDescendants()
@@ -171,7 +171,7 @@ public function hasProductCategories()
      *
      * @ORM\Column(name="hierarchy", type="integer")
      */
-    private $level;
+    private $hierarchy;
 
     /**
      * @var int
@@ -275,27 +275,27 @@ public function getName()
     }
 
     /**
-     * Set level.
+     * Set hierarchy.
      *
-     * @param int $level
+     * @param int $hierarchy
      *
      * @return Category
      */
-    public function setLevel($level)
+    public function setHierarchy($hierarchy)
     {
-        $this->level = $level;
+        $this->hierarchy = $hierarchy;
 
         return $this;
     }
 
     /**
-     * Get level.
+     * Get hierarchy.
      *
      * @return int
      */
-    public function getLevel()
+    public function getHierarchy()
     {
-        return $this->level;
+        return $this->hierarchy;
     }
 
     /**

diff --git a/tests/Eccube/Tests/Plugin/Web/Admin/Product/CategoryContorllerTest.php b/tests/Eccube/Tests/Plugin/Web/Admin/Product/CategoryContorllerTest.php
@@ -233,14 +233,14 @@ private function newTestCategory($TestCreator, $TestParentCategory = null)
         if ($TestParentCategory == null) {
             $TestCategory->setName('テスト家具')
                 ->setRank(100)
-                ->setLevel(100)
+                ->setHierarchy(100)
                 ->setDelFlg(false)
                 ->setParent($TestParentCategory)
                 ->setCreator($TestCreator);
         } else {
             $TestCategory->setName($TestParentCategory->getName() . '_c')
                 ->setRank($TestParentCategory->getRank() + 1)
-                ->setLevel($TestParentCategory->getLevel() + 1)
+                ->setHierarchy($TestParentCategory->getHierarchy() + 1)
                 ->setDelFlg(false)
                 ->setParent($TestParentCategory)
                 ->setCreator($TestCreator);

diff --git a/tests/Eccube/Tests/Repository/CategoryRepositoryTest.php b/tests/Eccube/Tests/Repository/CategoryRepositoryTest.php
@@ -171,7 +171,7 @@ public function testSave()
         $name = $faker->name;
         $Category = new Category();
         $Category->setName($name)
-            ->setLevel(1);
+            ->setHierarchy(1);
         $result = $this->app['eccube.repository.category']->save($Category);
         $this->assertTrue($result);
 
@@ -186,7 +186,7 @@ public function testSaveWithException()
         $name = $faker->name;
         $Category = new Category();
         $Category->setName($name)
-            ->setLevel(null);   // level は not null なので例外になる
+            ->setHierarchy(null);   // level は not null なので例外になる
         $result = $this->app['eccube.repository.category']->save($Category);
         $this->assertFalse($result);
     }

diff --git a/tests/Eccube/Tests/Repository/ProductRepositoryGetQueryBuilderBySearchDataAdminTest.php b/tests/Eccube/Tests/Repository/ProductRepositoryGetQueryBuilderBySearchDataAdminTest.php
@@ -232,7 +232,7 @@ public function testCategoryWithOut()
         $Category
             ->setName('test')
             ->setRank(1)
-            ->setLevel(1)
+            ->setHierarchy(1)
             ->setCreateDate(new \DateTime())
             ->setUpdateDate(new \DateTime());
         $this->app['orm.em']->persist($Category);

diff --git a/tests/Eccube/Tests/Repository/ProductRepositoryGetQueryBuilderBySearchDataTest.php b/tests/Eccube/Tests/Repository/ProductRepositoryGetQueryBuilderBySearchDataTest.php
@@ -60,7 +60,7 @@ public function testCategoryWithOut()
         $Category
             ->setName('test')
             ->setRank(1)
-            ->setLevel(1)
+            ->setHierarchy(1)
             ->setCreateDate(new \DateTime())
             ->setUpdateDate(new \DateTime());
         $this->app['orm.em']->persist($Category);

diff --git a/tests/Eccube/Tests/Web/Admin/Product/CategoryContorllerTest.php b/tests/Eccube/Tests/Web/Admin/Product/CategoryContorllerTest.php
@@ -278,13 +278,13 @@ private function newTestCategory($TestCreator, $TestParentCategory = null)
         if ($TestParentCategory == null) {
             $TestCategory->setName('テスト家具')
                 ->setRank(100)
-                ->setLevel(100)
+                ->setHierarchy(100)
                 ->setParent($TestParentCategory)
                 ->setCreator($TestCreator);
         } else {
             $TestCategory->setName($TestParentCategory->getName() . '_c')
                 ->setRank($TestParentCategory->getRank() + 1)
-                ->setLevel($TestParentCategory->getLevel() + 1)
+                ->setHierarchy($TestParentCategory->getHierarchy() + 1)
                 ->setParent($TestParentCategory)
                 ->setCreator($TestCreator);
         }

diff --git a/tests/createEcCubeData-v30.php b/tests/createEcCubeData-v30.php
@@ -444,7 +444,7 @@ public function createCategories()
             $Category->setCreator($common_val['creator'])
                 ->setDelFlg($common_val['del_flg'])
                 ->setName(sprintf("Category%d00", $i))
-                ->setLevel(1)
+                ->setHierarchy(1)
                 ->setRank($this->lfGetTotalCategoryrank($existingMaxRank) - $count);
             $this->saveEntity($Category);
             $this->arrCategory1[] = $Category;
@@ -460,7 +460,7 @@ public function createCategories()
                     ->setName(sprintf("Category%d%d0", $i,
                         $j + MIDDLE_CATEGORIES_VOLUME))
                     ->setParent($top_category)
-                    ->setLevel(2)
+                    ->setHierarchy(2)
                     ->setRank($this->lfGetTotalCategoryrank($existingMaxRank) - $count);
                 $this->saveEntity($Category);
                 $this->arrCategory2[] = $Category;
@@ -477,7 +477,7 @@ public function createCategories()
                             $i, $j,
                             $k + SMALL_CATEGORIES_VOLUME))
                         ->setParent($middle_category)
-                        ->setLevel(3)
+                        ->setHierarchy(3)
                         ->setRank($this->lfGetTotalCategoryrank($existingMaxRank) - $count);
                     $this->saveEntity($Category);
                     $this->arrCategory3[] = $Category;