Code cleanup

app/config/routes.php

@@ -61,13 +61,12 @@
      */
 
     // Match Request
-// XXX should we use TierApiV1Controller? or v1match?
     $routes->get('/api/:matchgrid_id/v1/matchRequests/:id', ['controller' => 'TierApi', 'action' => 'viewMatchRequest']);
     $routes->get('/api/:matchgrid_id/v1/matchRequests', ['controller' => 'TierApi', 'action' => 'viewMatchRequests']);
     $routes->put('/api/:matchgrid_id/v1/people/:sor/:sorid', ['controller' => 'TierApi', 'action' => 'match']);
     $routes->post('/api/:matchgrid_id/v1/people/:sor/:sorid', ['controller' => 'TierApi', 'action' => 'search']);
-// XXX do we need the ?* here? (it breaks matchRequests -> viewMatchRequests)
-    $routes->get('/api/:matchgrid_id/v1/people/:sor/:sorid?*', ['controller' => 'TierApi', 'action' => 'search']);
+// This doesn't match and we end up in current(), so we just check there
+//    $routes->get('/api/:matchgrid_id/v1/people/:sor/:sorid?*', ['controller' => 'TierApi', 'action' => 'search']);
     $routes->delete('/api/:matchgrid_id/v1/people/:sor/:sorid', ['controller' => 'TierApi', 'action' => 'remove']);
     $routes->get('/api/:matchgrid_id/v1/people/:sor/:sorid', ['controller' => 'TierApi', 'action' => 'current']);
     $routes->get('/api/:matchgrid_id/v1/people/:sor', ['controller' => 'TierApi', 'action' => 'inventory']);

app/config/schema/schema.xml

@@ -24,10 +24,6 @@
   must be specified in raw SQL, which needs the prefixed table name.
 -->
 <schema version="0.3">
-<!--
-  XXX document datamodel
--->
-
   <table name="meta">
     <field name="id" type="I">
       <key />
@@ -171,11 +167,6 @@
     <index name="rule_attributes_i1">
       <col>rule_id</col>
     </index>
-
-<!-- XXX do we really need this index? -->
-    <index name="rule_attributes_i1">
-      <col>attribute_id</col>
-    </index>
   </table>
 
   <table name="systems_of_record">

app/src/Controller/ApiUsersController.php

@@ -29,7 +29,27 @@
 
 namespace App\Controller;
 
+use Cake\Routing\Router;
+
 class ApiUsersController extends StandardController {
+  /**
+   * Callback run prior to the view rendering.
+   *
+   * @since  COmanage Match v1.0.0
+   * @param  Event $event Cake Event
+   */
+
+  public function beforeRender(\Cake\Event\Event $event) {
+    parent::beforeRender($event);
+
+    // Populate a pointer to the REST API for configuration purposes
+    $mgid = isset($this->cur_mg->id) ? $this->cur_mg->id : null;
+
+    $fragment = "/api/" . ($mgid ? $mgid : "{matchgrid_id}") . "/v1";
+
+    $this->set('vv_api_uri', Router::url($fragment, true));
+  }
+
   /**
    * Authorization for this Controller, called by Auth component
    * - postcondition: $vv_permissions set with calculated permissions for this Controller