From dc2eecbe0cd9f5314842f5ca8bc5b837dd5c24b8 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Fri, 20 Sep 2019 06:38:52 +0000
Subject: [PATCH] Rename InvoiceCreator to InvoiceGenerator. #265

---
 config/services.yaml                               |  4 ++--
 src/Controller/APIController.php                   |  6 +++---
 src/Controller/JobOrderController.php              |  8 ++++----
 src/Controller/RAPIController.php                  |  4 ++--
 src/Service/InvoiceCreatorInterface.php            | 14 --------------
 .../ResqInvoiceGenerator.php}                      |  8 ++++----
 src/Service/InvoiceGeneratorInterface.php          | 14 ++++++++++++++
 7 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 src/Service/InvoiceCreatorInterface.php
 rename src/Service/{InvoiceCreator/ResqInvoiceCreator.php => InvoiceGenerator/ResqInvoiceGenerator.php} (98%)
 create mode 100644 src/Service/InvoiceGeneratorInterface.php

diff --git a/config/services.yaml b/config/services.yaml
index 65abbe59..958e8133 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -132,7 +132,7 @@ services:
             - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
 
     # invoice creator
-    App\Service\InvoiceCreator\CMBInvoiceCreator: ~
+    App\Service\InvoiceGenerator\ResqInvoiceGenerator: ~
 
     # invoice creator interface
-    App\Service\InvoiceCreatorInterface: "@App\\Service\\InvoiceCreator\\CMBInvoiceCreator"
+    App\Service\InvoiceGeneratorInterface: "@App\\Service\\InvoiceGenerator\\ResqInvoiceGenerator"
diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 92146e1b..99456ed6 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -24,7 +24,7 @@ use App\Ramcar\TransactionOrigin;
 use App\Ramcar\TradeInType;
 use App\Ramcar\JOEventType;
 
-use App\Service\InvoiceCreatorInterface;
+use App\Service\InvoiceGeneratorInterface;
 use App\Service\RisingTideGateway;
 use App\Service\MQTTClient;
 use App\Service\GeofenceTracker;
@@ -808,7 +808,7 @@ class APIController extends Controller
         return $res->getReturnResponse();
     }
 
-    public function requestJobOrder(Request $req, InvoiceCreatorInterface $ic, GeofenceTracker $geo)
+    public function requestJobOrder(Request $req, InvoiceGeneratorInterface $ic, GeofenceTracker $geo)
     {
         // check required parameters and api key
         $required_params = [
@@ -1020,7 +1020,7 @@ class APIController extends Controller
         return $res->getReturnResponse();
     }
 
-    public function getEstimate(Request $req, InvoiceCreatorInterface $ic)
+    public function getEstimate(Request $req, InvoiceGeneratorInterface $ic)
     {
         // $this->debugRequest($req);
 
diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index d746a59b..c81a8694 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -27,7 +27,7 @@ use App\Entity\Battery;
 use App\Entity\JOEvent;
 use App\Entity\JORejection;
 
-use App\Service\InvoiceCreatorInterface;
+use App\Service\InvoiceGeneratorInterface;
 use App\Service\MapTools;
 use App\Service\HubCounter;
 use App\Service\MQTTClient;
@@ -251,7 +251,7 @@ class JobOrderController extends Controller
         return $this->render('job-order/form.html.twig', $params);
     }
 
-    public function openEditSubmit(Request $req, ValidatorInterface $validator, InvoiceCreatorInterface $ic, $id)
+    public function openEditSubmit(Request $req, ValidatorInterface $validator, InvoiceGeneratorInterface $ic, $id)
     {
         $this->denyAccessUnlessGranted('jo_open.edit', null, 'No access.');
 
@@ -425,7 +425,7 @@ class JobOrderController extends Controller
         return $this->render('job-order/form.html.twig', $params);
     }
 
-    public function incomingSubmit(Request $req, ValidatorInterface $validator, InvoiceCreatorInterface $ic)
+    public function incomingSubmit(Request $req, ValidatorInterface $validator, InvoiceGeneratorInterface $ic)
     {
         $this->denyAccessUnlessGranted('jo_in.list', null, 'No access.');
 
@@ -2482,7 +2482,7 @@ class JobOrderController extends Controller
         return null;
     }
 
-    public function generateInvoice(Request $req, InvoiceCreatorInterface $ic)
+    public function generateInvoice(Request $req, InvoiceGeneratorInterface $ic)
     {
         // error_log('generating invoice...');
         $error = false;
diff --git a/src/Controller/RAPIController.php b/src/Controller/RAPIController.php
index a613a150..bc20fd4c 100644
--- a/src/Controller/RAPIController.php
+++ b/src/Controller/RAPIController.php
@@ -25,7 +25,7 @@ use App\Ramcar\InvoiceStatus;
 use App\Ramcar\ModeOfPayment;
 use App\Ramcar\JOEventType;
 
-use App\Service\InvoiceCreatorInterface;
+use App\Service\InvoiceGeneratorInterface;
 use App\Service\MQTTClient;
 
 use App\Entity\RiderSession;
@@ -739,7 +739,7 @@ class RAPIController extends Controller
         error_log(print_r($all, true));
     }
 
-    public function changeService(Request $req, InvoiceCreatorInterface $ic)
+    public function changeService(Request $req, InvoiceGeneratorInterface $ic)
     {
         $this->debugRequest($req);
 
diff --git a/src/Service/InvoiceCreatorInterface.php b/src/Service/InvoiceCreatorInterface.php
deleted file mode 100644
index 3d13b5f6..00000000
--- a/src/Service/InvoiceCreatorInterface.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use App\Entity\Invoice;
-
-use App\Ramcar\InvoiceCriteria;
-
-interface InvoiceCreatorInterface
-{
-    // process invoice criteria
-    public function processCriteria(InvoiceCriteria $criteria);
-
-}
diff --git a/src/Service/InvoiceCreator/ResqInvoiceCreator.php b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
similarity index 98%
rename from src/Service/InvoiceCreator/ResqInvoiceCreator.php
rename to src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
index 42f6a517..9f66d5d3 100644
--- a/src/Service/InvoiceCreator/ResqInvoiceCreator.php
+++ b/src/Service/InvoiceGenerator/ResqInvoiceGenerator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Service\InvoiceCreator;
+namespace App\Service\InvoiceGenerator;
 
 use App\Ramcar\InvoiceCriteria;
 use App\Ramcar\TradeInType;
@@ -12,11 +12,11 @@ use App\Entity\Invoice;
 use App\Entity\InvoiceItem;
 use App\Entity\User;
 
-use App\Service\InvoiceCreatorInterface;
+use App\Service\InvoiceGeneratorInterface;
 
 use Doctrine\Common\Util\Debug;
 
-class ResqInvoiceCreator implements InvoiceCreatorInterface
+class ResqInvoiceGenerator implements InvoiceGeneratorInterface
 {
     const TAX_RATE              = 0.12;
     const SERVICE_FEE           = 300;
@@ -27,7 +27,7 @@ class ResqInvoiceCreator implements InvoiceCreatorInterface
     {
     }
 
-    public function processCriteria(InvoiceCriteria $criteria)
+    public function generateInvoice(InvoiceCriteria $criteria)
     {
         // initialize
         $invoice = new Invoice();
diff --git a/src/Service/InvoiceGeneratorInterface.php b/src/Service/InvoiceGeneratorInterface.php
new file mode 100644
index 00000000..b5fee76f
--- /dev/null
+++ b/src/Service/InvoiceGeneratorInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Service;
+
+use App\Entity\Invoice;
+
+use App\Ramcar\InvoiceCriteria;
+
+interface InvoiceGeneratorInterface
+{
+    // generate invoice using a criteria 
+    public function generateInvoice(InvoiceCriteria $criteria);
+
+}