Changeset 549 for trunk

Timestamp:

May 27, 2010, 9:24:43 PM (14 years ago)

Author:

gav

Message:

Add InventoryItemService savePicture(), part 2.
Add some more comments, another error code and ensure the inputStream gets closed.
Add gnuMims logo as an example picture to the demo inventory items.

Location:

trunk/grails-app

Files:

• i18n/messages.properties (modified) (1 diff)
• services/CreateDataService.groovy (modified) (7 diffs)
• services/InventoryItemService.groovy (modified) (4 diffs)

trunk/grails-app/i18n/messages.properties

@@ -156 +156 @@
 inventory.item.already.has.picture=Inventory item already has a picture, please delete the old picture first.
 inventory.item.picture.file.unrecognised=Image file [{0}]: type not recognised.
+inventory.item.picture.source.not.supported=Image source type not supported.
 
 inventoryMovement.quantity.insufficientItemsInStock=Could not complete operation, insufficient items in stock.

trunk/grails-app/services/CreateDataService.groovy

@@ -13 +13 @@
     def dateUtilService
     def appConfigService
+    def inventoryItemService
     def assignedGroupService
     def assignedPersonService
+
+    def grailsApplication
 
 /*******************************************
@@ -1203 +1206 @@
         def inventoryItemInstance
 
+        def pictureResource = grailsApplication.mainContext.getResource('images/logo.png')
+
         //InventoryItem #1
         inventoryItemInstance = new InventoryItem(inventoryGroup: InventoryGroup.get(1),
@@ -1213 +1218 @@
                                                                                     reorderPoint: 0)
         saveAndTest(inventoryItemInstance)
+        inventoryItemService.savePicture(inventoryItemInstance, pictureResource)
 
         //InventoryItem #2
@@ -1225 +1231 @@
                                                                                     reorderPoint: 0)
         saveAndTest(inventoryItemInstance)
+        inventoryItemService.savePicture(inventoryItemInstance, pictureResource)
 
         //InventoryItem #3
@@ -1236 +1243 @@
                                                                                     reorderPoint: 2)
         saveAndTest(inventoryItemInstance)
+        inventoryItemService.savePicture(inventoryItemInstance, pictureResource)
 
         //InventoryItem #4
@@ -1247 +1255 @@
                                                                                     reorderPoint: 0)
         saveAndTest(inventoryItemInstance)
+        inventoryItemService.savePicture(inventoryItemInstance, pictureResource)
 
         //InventoryItem #5
@@ -1258 +1267 @@
                                                                                     reorderPoint: 2)
         saveAndTest(inventoryItemInstance)
+        inventoryItemService.savePicture(inventoryItemInstance, pictureResource)
     }
 

trunk/grails-app/services/InventoryItemService.groovy

@@ -261 +261 @@
                 return fail(field:"picture", code:"inventory.item.already.has.picture")
 
+            // Declare some more variables, since we appear to have most of what we need.
             def picture = new Picture(inventoryItem: result.inventoryItemInstance)
             def imaging = new Imaging()
@@ -268 +269 @@
             def pictureInputStream
 
+            // Check the supplied pictureSource and get the inputStream.
             if(pictureSource instanceof javax.servlet.http.HttpServletRequest) {
                 def multiPartFile = pictureSource.getFile('file')
@@ -293 +295 @@
             }
             else {
-                    return fail(code:"default.file.not.supplied")
-            }
-
+                    return fail(code:"inventory.item.picture.source.not.supported")
+            }
+
+            // Create the Images.
             try {
                 images = imaging.createAll(result.inventoryItemInstance, picture, pictureInputStream)
+                // Ensure the stream is closed.
+                pictureInputStream.close()
             }
             catch(Exception ex) {
                 log.error("picture save", ex)
+                // Ensure the stream is closed.
+                pictureInputStream.close()
                 return fail(code:"inventory.item.picture.file.unrecognised", args: [pictureFileName])
             }
 
+            // Add images to picture.
             images.each { image ->
                 picture.addToImages(image)
             }
 
+            // Save picture.
             if(picture.hasErrors() || !picture.save())
                 return fail(code:"default.create.failure", args: ["Picture"])
@@ -313 +322 @@
             result.inventoryItemInstance.picture = picture
 
+            // Save inventoryItem.
             if(result.inventoryItemInstance.hasErrors() || !result.inventoryItemInstance.save())
                 return fail(code:"default.create.failure")