Locations many categories

src/admin/LocationAdmin.php

@@ -54,7 +54,6 @@ public function getExportFields()
                 'Phone' => 'Phone',
                 'Fax' => 'Fax',
                 'Email' => 'Email',
-                'Category.Name' => 'Category',
                 'ShowInLocator' => 'ShowInLocator',
                 'Featured' => 'Featured',
                 'Lat' => 'Lat',

src/bulkloader/LocationCsvBulkLoader.php

@@ -18,7 +18,6 @@ class LocationCsvBulkLoader extends CsvBulkLoader
         'Name' => 'Title',
         'City' => 'Suburb',
         'EmailAddress' => 'Email',
-        'Category' => 'Category.Name',
         'Import_ID' => 'Import_ID',
     );
 
@@ -32,12 +31,13 @@ class LocationCsvBulkLoader extends CsvBulkLoader
     /**
      * @var array
      */
+    /*
     public $relationCallbacks = array(
        'Category.Name' => array(
            'relationname' => 'Category',
            'callback' => 'getCategoryByName',
         ),
-    );
+    );*/
 
     /**
      * @param $obj

src/objects/Location.php

@@ -51,12 +51,9 @@ class Location extends DataObject implements PermissionProvider
         'Import_ID' => 'Int',
     );
 
-    /**
-     * @var array
-     */
-    private static $has_one = array(
-        'Category' => LocationCategory::class,
-    );
+    private static $many_many = [
+        'Categories' => LocationCategory::class,
+    ];
 
     /**
      * @var string
@@ -97,7 +94,6 @@ class Location extends DataObject implements PermissionProvider
         'Website',
         'Phone',
         'Email',
-        'Category.ID',
         'Featured',
     );
 
@@ -113,7 +109,6 @@ class Location extends DataObject implements PermissionProvider
         'State',
         'PostalCode',
         'Country',
-        'Category.Name',
         'Featured.NiceAsBoolean',
         'Coords',
     );
@@ -161,11 +156,6 @@ public function getCMSFields()
 
         $fields->replaceField('Email', EmailField::create('Email'));
 
-        $fields->replaceField(
-            'CategoryID',
-            DropdownField::create('CategoryID', 'Category', LocationCategory::get()->map())->setEmptyString('')
-        );
-
         $featured = $fields->dataFieldByName('Featured')
             ->setDescription('Location will display near the top of the results list');
         $fields->insertAfter(

src/objects/LocationCategory.php

@@ -13,7 +13,7 @@
  * Class LocationCategory
  *
  * @property string $Name
- * @method Locations|HasManyList $Locations
+ * @method Locations|ManyManyList $Locations
  * @method Locators|ManyManyList $Locators
  */
 class LocationCategory extends DataObject
@@ -35,18 +35,12 @@ class LocationCategory extends DataObject
         'Name' => 'Varchar(100)',
     );
 
-    /**
-     * @var array
-     */
-    private static $has_many = array(
-        'Locations' => Location::class,
-    );
-
     /**
      * @var array
      */
     private static $belogs_many_many = array(
         'Locators' => Locator::class,
+        'LocationSet' => Location::class,
     );
 
     /**

src/pages/Locator.php

@@ -212,9 +212,7 @@ public function getShowRadius()
      */
     public function getCategories()
     {
-        return $this->Categories()->filter(array(
-            'Locations.ID:GreaterThan' => 0
-        ));
+        return $this->Categories();
     }
 
     /**

src/pages/LocatorController.php

@@ -235,11 +235,11 @@ public function setLocations(HTTPRequest $request = null)
 
         $categoryVar = Config::inst()->get(Locator::class, 'category_var');
         if ($request->getVar($categoryVar)) {
-            $filter['CategoryID'] = $request->getVar($categoryVar);
+            $filter['Categories.ID'] = $request->getVar($categoryVar);
         } else {
             if ($this->getPageCategories()->exists()) {
                 foreach ($this->getPageCategories() as $category) {
-                    $filter['CategoryID'][] = $category->ID;
+                    $filter['Categories.ID'][] = $category->ID;
                 }
             }
         }

tasks/LocationCategoriesTask.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Dynamic\Locator\Tasks;
+
+use Dynamic\Locator\Location;
+use SilverStripe\Dev\BuildTask;
+use SilverStripe\ORM\DataObject;
+
+/**
+ * Class LocationCategoriesTask
+ * @package Dynamic\Locator\Tasks
+ */
+class LocationCategoriesTask extends BuildTask
+{
+
+    /**
+     * @var string
+     */
+    protected $title = 'Location categories to many_many';
+
+    /**
+     * @var string
+     */
+    protected $description = 'Migration task - Converts locations to have multiple categories';
+
+    /**
+     * @var bool
+     */
+    protected $enabled = true;
+
+    /**
+     * @param $request
+     */
+    public function run($request)
+    {
+        /** @var DataObject $class */
+        $class = ($request->getVar('locationclass')) ? $request->getVar('locationclass') : Location::class;
+        $class::add_extension(LocationCategoryExtension::class);
+
+        $ct = 0;
+
+        $convert = function (DataObject $location) use (&$ct) {
+            $location->Categories()->add($location->Category());
+            $location->write();
+            $ct++;
+        };
+
+        foreach ($this->iterateLocations($class) as $location) {
+            $convert($location);
+        }
+
+        echo "{$ct} categories converted";
+    }
+
+    /**
+     * @param string $class
+     * @return Generator
+     */
+    protected function iterateLocations($class)
+    {
+        foreach ($class::get() as $location) {
+            yield $location;
+        }
+    }
+
+}