Changeset 898 for branches

Timestamp:

Apr 22, 2011, 5:18:04 PM (14 years ago)

Author:

gav

Message:

Add savePurchaseOrderNumber() and savePurchaseOrderNumberRange() to PurchaseOrderService.

Location:

branches/features/purchaseOrders

Files:

• grails-app/services/CreateDataService.groovy (modified) (2 diffs)
• grails-app/services/PurchaseOrderService.groovy (modified) (2 diffs)
• src/groovy/com (added)
• src/groovy/com/henyo (added)
• src/groovy/com/henyo/BaseUnitTestCase.groovy (added)
• test/unit/PurchaseOrderServiceTests.groovy (modified) (9 diffs)

branches/features/purchaseOrders/grails-app/services/CreateDataService.groovy

@@ -17 +17 @@
     def appConfigService
     def searchableService
+    def purchaseOrderService
     def inventoryItemService
     def assignedGroupService
@@ -1740 +1741 @@
 
     def createDemoPurchaseOrderNumbers() {
-        for (int i=10000; i<10100; i++) {
-            saveAndTest(new PurchaseOrderNumber(value:"P${i}"))
-        }
+        def r = purchaseOrderService.savePurchaseOrderNumberRange("P", 10000, 10100)
     }
 

branches/features/purchaseOrders/grails-app/services/PurchaseOrderService.groovy

@@ +1 @@
+/**
+ * Provides a service class for the PurchaseOrder and PurchaseOrderNumber domain classes.
+ */
 class PurchaseOrderService {
 
     boolean transactional = false
+
+    def savePurchaseOrderNumberRange(prefix, startOfRange, endOfRange, suffix="") {
+        PurchaseOrderNumber.withTransaction { status ->
+            def result = [:]
+
+            def fail = { Map m ->
+                status.setRollbackOnly()
+                if(result.purchaseOrderNumber && m.field)
+                    result.purchaseOrderNumber.errors.rejectValue(m.field, m.code)
+                result.error = [ code: m.code, args: ["PurchaseOrderNumber"] ]
+                return result
+            }
+
+            // Sanity checks.
+            if(startOfRange < 0)
+                return fail(code:"default.create.failure")
+            if(endOfRange < 0)
+                return fail(code:"default.create.failure")
+            // Auto swap range.
+            if(endOfRange < startOfRange)
+                (startOfRange, endOfRange) = [endOfRange, startOfRange]
+
+            def r
+            def p = [:]
+            for(i in startOfRange..endOfRange) {
+                p.value= "${prefix}${i}${suffix}"
+                r = savePurchaseOrderNumber(p)
+                if(r.error)
+                    return fail(code: r.code)
+                    
+            }
+
+            // Success.
+            return result
+        }
+    }
 
     PurchaseOrderNumber findNextUnusedPurchaseOrderNumber() {
@@ -37 +76 @@
         return drafts
     }
+
+    def savePurchaseOrderNumber(params) {
+        PurchaseOrderNumber.withTransaction { status ->
+            def result = [:]
+
+            def fail = { Map m ->
+                status.setRollbackOnly()
+                if(result.purchaseOrderNumber && m.field)
+                    result.purchaseOrderNumber.errors.rejectValue(m.field, m.code)
+                result.error = [ code: m.code, args: ["PurchaseOrderNumber", params.id] ]
+                return result
+            }
+
+            result.purchaseOrderNumber = new PurchaseOrderNumber(params)
+
+            if(result.purchaseOrderNumber.hasErrors() || !result.purchaseOrderNumber.save())
+                return fail(code:"default.create.failure")
+
+            // Success.
+            return result
+        }
+    }
+
 }

branches/features/purchaseOrders/test/unit/PurchaseOrderServiceTests.groovy

@@ -1 +1 @@
 import grails.test.*
+import com.henyo.BaseUnitTestCase
 import static org.junit.Assert.assertThat
 import static org.hamcrest.CoreMatchers.equalTo
@@ -6 +7 @@
  * Unit tests for PurchaseOrderService class.
  */
-class PurchaseOrderServiceTests extends GrailsUnitTestCase {
+class PurchaseOrderServiceTests extends BaseUnitTestCase {
     def pos = new PurchaseOrderService()
 
@@ -21 +22 @@
     }
 
+    void testSavePurchaseOrderNumberExpectCommit() {
+        mockForTransaction(PurchaseOrderNumber)
+
+        def p = [value: "P100"]
+        def r = pos.savePurchaseOrderNumber(p)
+
+        assert ! r.error
+        assert PurchaseOrderNumber.count() == 1
+    }
+
+    void testSavePurchaseOrderNumberExpectRollback() {
+        mockForTransaction(PurchaseOrderNumber, true)
+
+        def p = [value: ""]
+        def r = pos.savePurchaseOrderNumber(p)
+
+        assert r.error
+        assert PurchaseOrderNumber.count() == 0
+    }
+
+    void testSavePurchaseOrderNumberRangeExpectCommit() {
+        mockForTransaction(PurchaseOrderNumber)
+
+        def r = pos.savePurchaseOrderNumberRange("P", 1000, 1009)
+
+        assert ! r.error
+        assert PurchaseOrderNumber.count() == 10
+    }
+
+    void testSavePurchaseOrderNumberRangeExpectRollback() {
+        mockForTransaction(PurchaseOrderNumber, true)
+
+        def r = pos.savePurchaseOrderNumberRange("P", -1000, 1009)
+
+        assert r.error
+        assert PurchaseOrderNumber.count() == 0
+    }
+
     void testFindsFirstUnusedPurchaseOrderWhenAllUnused() {
-        createTenPurchaseOrderNumbers()
-        assertThat PurchaseOrderNumber.list().size(), equalTo(10)
+        mockForTransaction(PurchaseOrderNumber)
+        pos.savePurchaseOrderNumberRange("P", 1000, 1009)
 
         def next = pos.findNextUnusedPurchaseOrderNumber()
@@ -31 +70 @@
 
     void testFindsFirstUnusuedPurchaseOrderWhenSomeUsed() {
-        createTenPurchaseOrderNumbers()
+        mockForTransaction(PurchaseOrderNumber)
+        pos.savePurchaseOrderNumberRange("P", 1000, 1009)
         createPurchaseOrders(4)
 
@@ -40 +80 @@
 
     void testFindsNullIfNoUnusedPurchaseOrderNumbers() {
-        createTenPurchaseOrderNumbers()
+        mockForTransaction(PurchaseOrderNumber)
+        pos.savePurchaseOrderNumberRange("P", 1000, 1009)
         createPurchaseOrders(10)
 
@@ -49 +90 @@
 
     void testGetOrCreatePurchaseOrderWithExistingOrder() {
-        createTenPurchaseOrderNumbers()
+        mockForTransaction(PurchaseOrderNumber)
+        pos.savePurchaseOrderNumberRange("P", 1000, 1009)
         createPurchaseOrders(3)
         def params=[purchaseOrderNumber:[id:2]]
@@ -60 +102 @@
 
     void testGetOrCreatePurchaseOrderWithNoExistingOrder() {
-        createTenPurchaseOrderNumbers()
+        mockForTransaction(PurchaseOrderNumber)
+        pos.savePurchaseOrderNumberRange("P", 1000, 1009)
         createPurchaseOrders(3)
         createSuppliers(1)
@@ -72 +115 @@
 
     void testFindsDraftPurchaseOrderNumbers() {
-        createTenPurchaseOrderNumbers()
+        mockForTransaction(PurchaseOrderNumber)
+        pos.savePurchaseOrderNumberRange("P", 1000, 1009)
         createPurchaseOrders(3)
         releaseOrder(PurchaseOrder.get(2))
@@ -103 +147 @@
     }
 
-    private createTenPurchaseOrderNumbers() {
-        for (int i = 1000; i < 1010; i++) {
-            new PurchaseOrderNumber(value: "P${i}").save(failOnError: true)
-        }
-    }
-
     def releaseOrder(PurchaseOrder po) {
         po.ordered = new Date()