Model Control Service Fixement

Author: tomeq

src/main/java/com/Polodz/View/MainWindow.java

@@ -169,7 +169,7 @@ public void actionPerformed(ActionEvent e) {
 				DefaultMutableTreeNode node = getSelectedItemDefaultMutableTreeNode();
 				DefaultMutableTreeNode nodeParent = (DefaultMutableTreeNode) node.getParent();
 				addToSelectedSubTree((String)node.getUserObject(),rootNode.getChildCount()-1);
-				mainController.deleteMembersProduct(new Long(rootNode.getIndex(nodeParent)),nodeParent.getIndex(node));
+				((MainController) mainController).returnItemTo(new Long(rootNode.getIndex(nodeParent)),nodeParent.getIndex(node));
 				modelTree.removeNodeFromParent(node);
 			}
 		});

src/main/java/com/Polodz/controller/IMainController.java

@@ -1,6 +1,7 @@
 package com.Polodz.controller;
 
 import com.Polodz.View.MainWindow;
+import com.Polodz.model.IItem;
 
 public interface IMainController {
 
@@ -16,5 +17,7 @@ public interface IMainController {
 
     public String getAuditRaport();
 
+	void insertMemberProduct(IItem itemToMove, Long memberIdDestination);
+
 
 }

src/main/java/com/Polodz/controller/MainController.java

@@ -16,6 +16,7 @@
 import com.Polodz.model.IItem;
 import com.Polodz.model.IMember;
 import com.Polodz.model.MembersDAO;
+import com.Polodz.model.Movie;
 import com.Polodz.service.WebService;
 
 @Configuration
@@ -96,17 +97,39 @@ public List<IMember> listAll() {
         return Arrays.asList(membersDAO.getALL());
 
     }
+    
+    public void returnItemTo(Long memberIdFrom, Integer indexItemFrom) {
+    	IItem cacheMoveItem = this.findItem(memberIdFrom, indexItemFrom);
+    	this.deleteMembersProduct(memberIdFrom, indexItemFrom);
+    	this.insertMemberProduct(cacheMoveItem,(long)this.memberById(new Long(this.getMembersDAO().getALL().length-1)).getId());
+    }
+    
+    private IItem findItem(Long memberId, Integer indexItem) {
+        IMember delatingItemsMember = this.memberById(memberId);
+  		return delatingItemsMember.getItems().get(indexItem);
+    }
+    
+    private IMember memberById(Long memberId) {
+    	return this.membersDAO.getMembersAudience().get(memberId.intValue());
+    }
 
     @Override
-    public void deleteMembersProduct(Long memberId, Integer index) {
-        IMember delatingItemsMember = this.membersDAO.getMembersAudience().get(memberId.intValue());
-        this.getServerResponse(delatingItemsMember.getName() + "delete");
-        delatingItemsMember.getItems().remove((int) index);
-        log.info(this.membersDAO.getALL()[membersDAO.getMembersAudience().size()-1]
-        		.getItems().stream().map (i -> i.getName()).collect (Collectors.joining ("\n")));
-        this.setRentWebItems(this.membersDAO.getALL()[membersDAO.getMembersAudience().size()-1]
-        		.getItems().stream().map (i -> i.getName()).collect (Collectors.joining ("\n")));
+    public void deleteMembersProduct(Long memberId, Integer indexItem) {
+    	IMember delatingItemsMember = this.memberById(memberId);
+        this.getServerResponse("delete"+findItem(memberId,indexItem));
+        delatingItemsMember.getItems().remove((int) indexItem);
+        if (this.membersDAO.getMembersAudience().size()-1==memberId) 
+        	this.refreshWeb();
     }
+    
+    @Override
+    public void insertMemberProduct(IItem itemToMove,Long memberIdDestination) {
+        IMember addingItemsMember = this.membersDAO.getMembersAudience().get(memberIdDestination.intValue());
+        this.getServerResponse("move" +itemToMove.getId() + " " +addingItemsMember.getId());
+        addingItemsMember.addItems().add((Movie) itemToMove);
+        if (this.membersDAO.getMembersAudience().size()-1==memberIdDestination)
+        	this.refreshWeb();
+    }   
 
     @Override
     public String getItemInfo(Long memberId, int index) {
@@ -142,5 +165,10 @@ public String getAuditRaport() {
         return raport.getRaportText();
 
     }
+    
+    private void refreshWeb() {
+    	this.setRentWebItems(this.membersDAO.getALL()[membersDAO.getMembersAudience().size()-1]
+        		.getItems().stream().map (i -> i.getName()).collect (Collectors.joining ("\n")));
+    }
 
 }

src/main/java/com/Polodz/model/IMember.java

@@ -4,6 +4,8 @@
 
 public interface IMember {
 
+	public Integer getId();
+	
     void setName(String bscName);
 
     List<? extends IItem> getItems();