Skip to content

Commit ce0dff5

Browse files
Merge pull request #10 from TomekMenetAdvencedJavaProgramming/Develop
Grown deploy With WEB
2 parents 8d0b39d + 828861c commit ce0dff5

File tree

6 files changed

+67
-12
lines changed

6 files changed

+67
-12
lines changed

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@
9191
<artifactId>commons-lang3</artifactId>
9292
<version>3.4</version>
9393
</dependency>
94+
<dependency>
95+
<groupId>org.apache.hadoop</groupId>
96+
<artifactId>hadoop-core</artifactId>
97+
<version>1.0.0</version>
98+
</dependency>
9499
</dependencies>
95100

96101
<build>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public void actionPerformed(ActionEvent e) {
169169
DefaultMutableTreeNode node = getSelectedItemDefaultMutableTreeNode();
170170
DefaultMutableTreeNode nodeParent = (DefaultMutableTreeNode) node.getParent();
171171
addToSelectedSubTree((String)node.getUserObject(),rootNode.getChildCount()-1);
172-
mainController.deleteMembersProduct(new Long(rootNode.getIndex(nodeParent)),nodeParent.getIndex(node));
172+
((MainController) mainController).returnItemTo(new Long(rootNode.getIndex(nodeParent)),nodeParent.getIndex(node));
173173
modelTree.removeNodeFromParent(node);
174174
}
175175
});

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.Polodz.controller;
22

33
import com.Polodz.View.MainWindow;
4+
import com.Polodz.model.IItem;
45

56
public interface IMainController {
67

@@ -16,5 +17,7 @@ public interface IMainController {
1617

1718
public String getAuditRaport();
1819

20+
void insertMemberProduct(IItem itemToMove, Long memberIdDestination);
21+
1922

2023
}

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

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.Polodz.model.IItem;
1717
import com.Polodz.model.IMember;
1818
import com.Polodz.model.MembersDAO;
19+
import com.Polodz.model.Movie;
1920
import com.Polodz.service.WebService;
2021

2122
@Configuration
@@ -96,17 +97,30 @@ public List<IMember> listAll() {
9697
return Arrays.asList(membersDAO.getALL());
9798

9899
}
100+
101+
public void returnItemTo(Long memberIdFrom, Integer indexItemFrom) {
102+
IItem cacheMoveItem = this.findItemFromDao(memberIdFrom, indexItemFrom);
103+
this.deleteMembersProduct(memberIdFrom, indexItemFrom);
104+
this.insertMemberProduct(cacheMoveItem,(long)this.memberByIdFromDao(new Long(this.getMembersDAO().getALL().length-1)).getId());
105+
}
99106

100107
@Override
101-
public void deleteMembersProduct(Long memberId, Integer index) {
102-
IMember delatingItemsMember = this.membersDAO.getMembersAudience().get(memberId.intValue());
103-
this.getServerResponse(delatingItemsMember.getName() + "delete");
104-
delatingItemsMember.getItems().remove((int) index);
105-
log.info(this.membersDAO.getALL()[membersDAO.getMembersAudience().size()-1]
106-
.getItems().stream().map (i -> i.getName()).collect (Collectors.joining ("\n")));
107-
this.setRentWebItems(this.membersDAO.getALL()[membersDAO.getMembersAudience().size()-1]
108-
.getItems().stream().map (i -> i.getName()).collect (Collectors.joining ("\n")));
108+
public void deleteMembersProduct(Long memberId, Integer indexItem) {
109+
IMember delatingItemsMember = this.memberByIdFromDao(memberId);
110+
this.getServerResponse("delete"+findItemFromDao(memberId,indexItem));
111+
delatingItemsMember.getItems().remove((int) indexItem);
112+
if (this.membersDAO.getMembersAudience().size()-1==memberId)
113+
this.refreshWeb();
109114
}
115+
116+
@Override
117+
public void insertMemberProduct(IItem itemToMove,Long memberIdDestination) {
118+
IMember addingItemsMember = this.membersDAO.getMembersAudience().get(memberIdDestination.intValue());
119+
this.getServerResponse("move" +itemToMove.getId() + " " +addingItemsMember.getId());
120+
addingItemsMember.addItems().add((Movie) itemToMove);
121+
if (this.membersDAO.getMembersAudience().size()-1==memberIdDestination)
122+
this.refreshWeb();
123+
}
110124

111125
@Override
112126
public String getItemInfo(Long memberId, int index) {
@@ -142,5 +156,19 @@ public String getAuditRaport() {
142156
return raport.getRaportText();
143157

144158
}
159+
160+
private void refreshWeb() {
161+
this.setRentWebItems(this.membersDAO.getALL()[membersDAO.getMembersAudience().size()-1]
162+
.getItems().stream().map (i -> i.getName()).collect (Collectors.joining ("\n")));
163+
}
164+
165+
public IItem findItemFromDao(Long memberId, Integer indexItem) {
166+
IMember foundItemsMember = this.memberByIdFromDao(memberId);
167+
return foundItemsMember.getItems().get(indexItem);
168+
}
169+
170+
public IMember memberByIdFromDao(Long memberId) {
171+
return this.membersDAO.getMembersAudience().get(memberId.intValue());
172+
}
145173

146174
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
public interface IMember {
66

7+
public Integer getId();
8+
79
void setName(String bscName);
810

911
List<? extends IItem> getItems();

src/test/java/com/Polodz/GrownApplicationTests.java

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.Polodz.service.ITelnet;
1919
import com.Polodz.service.TelnetConnector;
2020

21+
import org.apache.hadoop.mapred.gethistory_jsp;
2122
import org.junit.Assert;
2223
import static org.mockito.Mockito.*;
2324

@@ -50,18 +51,33 @@ public void setup(){
5051
public void membersLoad() {
5152
this.serverResponse();
5253
Assert.assertNotNull(mainControler.getMembersDAO().getMembersAudience());
54+
this.listAll();
55+
}
56+
57+
58+
public void serverResponse() {
59+
Assert.assertEquals(mainControler.getServerResponse("list"), "test\ntest1\ntest2\ntest3\ntest4\ntest5");
60+
}
61+
62+
public void listAll() {
5363
Assert.assertEquals(mainControler.listAll().size(), 6);
5464
Assert.assertEquals(mainControler.listAll().get(1).getName(), "test1");
5565
Assert.assertEquals(mainControler.listAll().get(1).getItems().get(1).getName(),"mtest1");
5666
}
5767

68+
@Test
69+
public void returnItemTo() {
70+
mainControler.returnItemTo(new Long(0), 2);
71+
this.findItem();
72+
}
5873

59-
public void serverResponse() {
60-
Assert.assertEquals(mainControler.getServerResponse("list"), "test\ntest1\ntest2\ntest3\ntest4\ntest5");
74+
public void findItem() {
75+
Integer mainStorId = mainControler.getMembersDAO().getMembersAudience().size() - 1;
76+
Assert.assertEquals(mainControler.findItemFromDao(new Long(mainStorId), 6).getId(), new Long(3));
6177
}
6278

6379
@Test
64-
public void deleteMemberProduct() {
80+
public void MemberDeleteProduct() {
6581
Integer idOfFiredMember= mainControler.listAll().size()-1;
6682
List<? extends IItem> basket = mainControler.getMembersDAO().getMembersAudience().get(idOfFiredMember).getItems();
6783
Integer lastBasketSize = basket.size() - 2;
@@ -70,6 +86,7 @@ public void deleteMemberProduct() {
7086
Assert.assertEquals(lastBasketSize,new Integer(basket.size()));
7187
}
7288

89+
7390
@Bean
7491
@Primary
7592
public ITelnet TelnetConnector() {

0 commit comments

Comments
 (0)