OBPIH-6969 Fixes after review

Author: alannadolny

grails-app/controllers/org/pih/warehouse/UrlMappings.groovy

@@ -805,7 +805,7 @@ class UrlMappings {
          * Inventory API endpoints
          */
 
-        "/api/locations/$id/inventories/import"(parseRequest: true) {
+        "/api/facilities/$facilityId/inventories/import" {
             controller = { "inventoryApi" }
             action = "importCsv"
         }

grails-app/controllers/org/pih/warehouse/api/InventoryApiController.groovy

@@ -22,8 +22,8 @@ class InventoryApiController {
 
         ImportDataCommand command = new ImportDataCommand(
                 data: CSVUtils.csvToObjects(fileData),
-                date: new Date(),
-                location: Location.get(params.id)
+                date: new Date(System.currentTimeMillis() - 1000),
+                location: Location.get(params.facilityId)
         )
 
         inventoryImportDataService.validateData(command)

grails-app/domain/org/pih/warehouse/inventory/Transaction.groovy

@@ -179,10 +179,7 @@ class Transaction implements Comparable, Serializable {
         comment(nullable: true)
         // transaction date cannot be in the future
         transactionDate(nullable: false,
-            validator: {
-                value -> value <= new Date(System.currentTimeMillis() + 1000)
-            }
-        )
+            validator: { value -> value <= new Date() })
 
 
         source(nullable: true,

grails-app/services/org/pih/warehouse/importer/InventoryImportDataService.groovy

@@ -337,24 +337,28 @@ class InventoryImportDataService implements ImportDataService {
     }
 
     private InventoryItem parseInventoryItem(Product product, def lotNumberRaw, def expirationDateRaw) {
+        Date expirationDate = parseExpirationDate(expirationDateRaw)
         String lotNumber = lotNumberRaw instanceof Double ? lotNumberRaw.toInteger() : lotNumberRaw
+        return inventoryService.findAndUpdateOrCreateInventoryItem(product, lotNumber, expirationDate)
+    }
 
-        if (!expirationDateRaw) {
-            return inventoryService.findAndUpdateOrCreateInventoryItem(product, lotNumber, null)
-        }
-
+    private Date parseExpirationDate(Object expirationDateRaw) {
         if (expirationDateRaw instanceof String) {
             Date expirationDate = EXPIRATION_DATE_FORMAT.parse(expirationDateRaw)
             Calendar calendar = Calendar.getInstance()
             calendar.setTime(expirationDate)
-            return inventoryService.findAndUpdateOrCreateInventoryItem(product, lotNumber, calendar.getTime())
+            return calendar.getTime()
+        }
+
+        if (expirationDateRaw instanceof Date) {
+            return expirationDateRaw
         }
 
         if (expirationDateRaw instanceof LocalDate) {
-            return inventoryService.findAndUpdateOrCreateInventoryItem(product, lotNumber, expirationDateRaw.toDate())
+            return expirationDateRaw.toDate()
         }
 
-        return inventoryService.findAndUpdateOrCreateInventoryItem(product, lotNumber, expirationDateRaw)
+        return null
     }
 
     private Location parseBinLocation(String binLocationName, Location parentLocation) {

grails-app/services/org/pih/warehouse/product/ProductService.groovy

@@ -832,11 +832,10 @@ class ProductService {
                 }
             }
 
-            Product savedProduct = product.save(flush: true)
-            if (!savedProduct) {
+            if (!product.save(flush: true)) {
                 throw new ValidationException("Could not save product '" + product.name + "'", product.errors)
             }
-            importedProducts.add(savedProduct)
+            importedProducts.add(product)
         }
 
         return importedProducts