refactoring

diff --git a/PartsList/PartsList/app/controllers/DesignChangeController.scala b/PartsList/PartsList/app/controllers/DesignChangeController.scala
index 71bb351..dffca9b 100644 (file)
--- a/PartsList/PartsList/app/controllers/DesignChangeController.scala
+++ b/PartsList/PartsList/app/controllers/DesignChangeController.scala
@@ -129,14 +129,14 @@ object DesignChangeController extends Controller{
         inTransaction {
           val designChange = DesignChangeManager().getById(designChangeId)
           if(!delParentName.isEmpty()) {
-            val delParent = PartManager().getByName(delParentName)
-            val delChild = PartManager().getByName(delChildName)
+            val delParent = PartManager().getByName(delParentName).head
+            val delChild = PartManager().getByName(delChildName).head
             val cancelDelRelation = designChange.delPartRelation.where(pr => pr.parentId === delParent.id and pr.childId === delChild.id).head
             DesignChangeManager().designChangeDelCancelBySeq(designChangeId, cancelDelRelation.dcSeq)
             }
           if(!addParentName.isEmpty()) {
-            val addParent = PartManager().getByName(addParentName)
-            val addChild = PartManager().getByName(addChildName)
+            val addParent = PartManager().getByName(addParentName).head
+            val addChild = PartManager().getByName(addChildName).head
             val cancelAddRelation = designChange.addPartRelation.where(pr => pr.parentId === addParent.id and pr.childId === addChild.id).head
             DesignChangeManager().designChangeAddCancelBySeq(designChangeId, cancelAddRelation.dcSeq)
             }
@@ -188,7 +188,7 @@ object DesignChangeController extends Controller{
       } else {
         inTransaction {
           val designChange = DesignChangeManager().getById(designChangeId)
-          val ParentPart = PartManager().getByName(targetParentName)
+          val ParentPart = PartManager().getByName(targetParentName).head
           val delRelation = designChange.delPartRelation.where(pr => pr.dcSeq === dcSeq).head
           val delPart = delRelation.child.head
           val delPartsListBean = PartsListBean(ParentPart.name, delPart.name, delRelation.quantity, delRelation.relationKey)
@@ -272,7 +272,7 @@ object DesignChangeController extends Controller{
          if(childNo.isEmpty()) {
              PartsListBean(parentNo, childNo, 0, "")
          } else {
-                 PartsListBean(parentNo, childNo, PartManager().getByName(parentNo).partRelation(PartManager().getByName(childNo).id).quantity, relationKey)
+                 PartsListBean(parentNo, childNo, PartManager().getByName(parentNo).head.partRelation(PartManager().getByName(childNo).head.id).quantity, relationKey)
          }
        }
 

diff --git a/PartsList/PartsList/app/controllers/PartsListController.scala b/PartsList/PartsList/app/controllers/PartsListController.scala
index c5a1db0..ea27dfa 100644 (file)
--- a/PartsList/PartsList/app/controllers/PartsListController.scala
+++ b/PartsList/PartsList/app/controllers/PartsListController.scala
@@ -184,7 +184,7 @@ object PartsListController extends Controller{
        }
        
        def generatePartsListBean(parentNo:String, childNo:String):PartsListBean = {
-         val pr = PartManager().getByName(parentNo).partRelation(PartManager().getByName(childNo).id)
+         val pr = PartManager().getByName(parentNo).head.partRelation(PartManager().getByName(childNo).head.id)
          if(childNo.isEmpty()) {
              PartsListBean(parentNo, childNo, 0, pr.relationKey)
          } else {

diff --git a/PartsList/PartsList/app/controllers/PartsMasterController.scala b/PartsList/PartsList/app/controllers/PartsMasterController.scala
index a40aeb7..65b5aa2 100644 (file)
--- a/PartsList/PartsList/app/controllers/PartsMasterController.scala
+++ b/PartsList/PartsList/app/controllers/PartsMasterController.scala
@@ -44,7 +44,7 @@ object PartsMasterController extends Controller{
              formWithErrors => BadRequest(views.html.createPartForm(formWithErrors, "")),
              part => {
                inTransaction {
-                 if(PartManager().getByName(part.name) == null ) {
+                 if(PartManager().getByName(part.name).size == 0) {
                    val newPart = PartManager().insert(part)
                    request.body.file("atach").map { atach =>
                      AtachManager().uploadAtach(atach, newPart.atach.grpName, newPart.id, 0, 0)
@@ -53,7 +53,7 @@ object PartsMasterController extends Controller{
                  } else {
                    Ok(views.html.createPartForm(partRegistForm.fill(PartForm(part.name, part.atach, part.projectName, part.price)), Messages("form.error2")))
                  }
-               }  
+               }
              }
          )
        }
@@ -85,10 +85,10 @@ object PartsMasterController extends Controller{
                    Home.flashing("success" -> "Part %s has been created".format(part.name))
                  } else {
                    // nameの変更の場合
-                   if( PartManager().getByName(part.name)!= null) {
+                   if( PartManager().getByName(part.name).size != 0) {
                     // 既存のnameへの変更であれば、エラー
                      val partForm = PartForm(part.name, null, part.projectName, part.price)
-                     Ok(views.html.updatePartForm(partRegistForm.fill(partForm), id, PartManager().getByName(partName), Messages("form.error2")))
+                     Ok(views.html.updatePartForm(partRegistForm.fill(partForm), id, PartManager().getByName(partName).head, Messages("form.error2")))
                    } else {
                      val updPart = PartManager().update(part, id)
                      request.body.file("atach").map { atach =>

diff --git a/PartsList/PartsList/app/controllers/services/PartsList.scala b/PartsList/PartsList/app/controllers/services/PartsList.scala
index b2c8843..a22eeea 100644 (file)
--- a/PartsList/PartsList/app/controllers/services/PartsList.scala
+++ b/PartsList/PartsList/app/controllers/services/PartsList.scala
@@ -7,9 +7,9 @@ import models.services._
 case class PartsList() {
        def getPartsBuffer(opt:Int, page:Int, key:String, relationKey:String):ArrayBuffer[PartsListShowBean] = {
                var partsBuffer = ArrayBuffer[PartsListShowBean]()
-               val targetPart = PartManager().getByName(key)
-               if(targetPart != null) {
-                 for(returnPartBuffer <- PartRecursion().down(PartManager().getByName(key), 1, opt, relationKey)) {
+               val targetParts = PartManager().getByName(key)
+               if(targetParts.size != 0) {
+                 for(returnPartBuffer <- PartRecursion().down(PartManager().getByName(key).head, 1, opt, relationKey)) {
                    partsBuffer += returnPartBuffer
                  }
                }
@@ -40,7 +40,7 @@ case class PartsList() {
                                }
              }
                 // 表示制御済みの部品表配列を蓄積
-                matrixPartsListBeans.put(PartManager().getByName(partsListBean.head.parent), allChildrenList)
+                matrixPartsListBeans.put(PartManager().getByName(partsListBean.head.parent).head, allChildrenList)
            } else {
              for(allChild <- allChildrenList) {
                allChild.showOn = 0

diff --git a/PartsList/PartsList/app/models/services/DesignChangeManager.scala b/PartsList/PartsList/app/models/services/DesignChangeManager.scala
index a7d77d7..7aa9169 100644 (file)
--- a/PartsList/PartsList/app/models/services/DesignChangeManager.scala
+++ b/PartsList/PartsList/app/models/services/DesignChangeManager.scala
@@ -103,27 +103,27 @@ case class DesignChangeManager() {
     var message:String = null
     // 更新時に、子品番の変更が無ければ、単純な員数更新
     if(data.partsListBeanAfter.child == partName) {
-      val updateRelation = dc.addPartRelation.where(pr => pr.parentId === PartManager().getByName(data.partsListBeanAfter.parent).id and
-          pr.childId === PartManager().getByName(data.partsListBeanAfter.child).id).head
+      val updateRelation = dc.addPartRelation.where(pr => pr.parentId === PartManager().getByName(data.partsListBeanAfter.parent).head.id and
+          pr.childId === PartManager().getByName(data.partsListBeanAfter.child).head.id).head
       updateRelation.quantity = data.partsListBeanAfter.quantity
       updateRelation.relationKey = data.partsListBeanAfter.relationKey
       PartsListDb.partRelations.update(updateRelation)      
     } else {
     // 更新時に、子品番の変更は、設計変更追加をキャンセル
-      val parent = PartManager().getByName(data.partsListBeanAfter.parent)
+      val parent = PartManager().getByName(data.partsListBeanAfter.parent).head
       var dcSeq: Long = 0L
       // loopチェック後に処理を行うので、設計変更追加処理を先に行う。
       // 更新後品番がブランクでなければ、設計変更の追加処理
       if(!data.partsListBeanAfter.child.isEmpty()) {
-        val child = PartManager().getByName(data.partsListBeanAfter.child)
+        val child = PartManager().getByName(data.partsListBeanAfter.child).head
         val updateRelation = dc.delPartRelation.where(pr => pr.parentId === parent.id and
-                       pr.childId === PartManager().getByName(data.partsListBeanBefore.child).id).head
+                       pr.childId === PartManager().getByName(data.partsListBeanBefore.child).head.id).head
         dcSeq = updateRelation.dcSeq
         message = relationAdd(data, dc, dcSeq)
       }
        // 更新前品番がブランクで無ければ、設計変更の追加をキャンセル
       if(message == null && !partName.isEmpty()) {
-        val cancelChild = PartManager().getByName(partName)
+        val cancelChild = PartManager().getByName(partName).head
         val updateRelation = dc.addPartRelation.where(pr => pr.parentId === parent.id and
                        pr.childId === cancelChild.id).head
         dcSeq = updateRelation.dcSeq
@@ -134,8 +134,8 @@ case class DesignChangeManager() {
   }
   
   def relationDel(parentNo: String, childNo: String, quantity: Long, relationKey: String, dc: DesignChange, dcSeq: Long) = {
-      val parent = PartManager().getByName(parentNo)
-      val delRelation = parent.parts.assign(PartManager().getByName(childNo))
+      val parent = PartManager().getByName(parentNo).head
+      val delRelation = parent.parts.assign(PartManager().getByName(childNo).head)
       PartRelationManager().updatePr(delRelation, quantity, relationKey, dc.dcSeq, dc, null)
   }
   

diff --git a/PartsList/PartsList/app/models/services/PartManager.scala b/PartsList/PartsList/app/models/services/PartManager.scala
index 10187ca..823f801 100644 (file)
--- a/PartsList/PartsList/app/models/services/PartManager.scala
+++ b/PartsList/PartsList/app/models/services/PartManager.scala
@@ -43,13 +43,8 @@ case class PartManager() extends AbstractManager{
     PartsListDb.parts.where(p => p.id === id).head
   }
   
-  def getByName(name: String):Part ={
-    if(!PartsListDb.parts.where(p => p.name === name).isEmpty) {
-      PartsListDb.parts.where(p => p.name === name).head
-    } else {
-      null
-    }
-    
+  def getByName(name: String):Query[Part] ={
+      PartsListDb.parts.where(p => p.name === name)
   }
   
   def getByLikeName(key: String) ={

diff --git a/PartsList/PartsList/app/models/services/PartRelationManager.scala b/PartsList/PartsList/app/models/services/PartRelationManager.scala
index f9cd018..c35115c 100644 (file)
--- a/PartsList/PartsList/app/models/services/PartRelationManager.scala
+++ b/PartsList/PartsList/app/models/services/PartRelationManager.scala
@@ -7,7 +7,7 @@ import org.squeryl.PrimitiveTypeMode._
 case class PartRelationManager() {
   def insert(data:PartsListBean, dc:DesignChange, dcSeq: Long):String = {
     if(Specification().loopSpec(data)) {
-      val pr = PartManager().getByName(data.parent).parts.associate(PartManager().getByName(data.child))
+      val pr = PartManager().getByName(data.parent).head.parts.associate(PartManager().getByName(data.child).head)
       // insertの後、attributeの更新
       updatePr(pr, data.quantity, data.relationKey, dcSeq, null, dc)
       return null
@@ -20,7 +20,7 @@ case class PartRelationManager() {
     if(data.child == childName) {
       if(Specification().loopSpec(data)) {
         //PartRelation データ更新処理
-        val pr = PartManager().getByName(data.parent).parts.assign(PartManager().getByName(data.child))
+        val pr = PartManager().getByName(data.parent).head.parts.assign(PartManager().getByName(data.child).head)
         updatePr(pr, data.quantity, data.relationKey, 0, null, null)
         return null
       } else {
@@ -53,7 +53,7 @@ case class PartRelationManager() {
   }
   
   def delete(data: PartsListBean, childName: String) = {
-       PartManager().getByName(data.parent).parts.dissociate(PartManager().getByName(childName))
+       PartManager().getByName(data.parent).head.parts.dissociate(PartManager().getByName(childName).head)
   }
   
 }
\ No newline at end of file