Skip to content

Commit fbfb235

Browse files
tomeqtomeq
authored andcommitted
services: deleteMember, getAudit
1 parent 1287578 commit fbfb235

File tree

9 files changed

+143
-13
lines changed

9 files changed

+143
-13
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public MainWindow(IMainController mainController) {
5656
setNimbus();
5757
initComponents();
5858
//mainController.setRentWebItems("Tst");
59+
this.mainController.getServerResponse(" ");
5960
this.setCentralText(((MainController) mainController).getLastServerResponse() + "\n");
6061
}
6162

@@ -72,7 +73,9 @@ private void initComponents() {
7273
btnNewButton = new JButton("Status");
7374
btnNewButton.addActionListener(new ActionListener() {
7475
public void actionPerformed(ActionEvent e) {
75-
//TODO
76+
DefaultMutableTreeNode node = getSelectedItemDefaultMutableTreeNode();
77+
DefaultMutableTreeNode nodeParent = (DefaultMutableTreeNode) node.getParent();
78+
setCentralText(mainController.getItemInfo(new Long(rootNode.getIndex(nodeParent)),nodeParent.getIndex(node)));
7679

7780
}
7881
});
@@ -170,7 +173,9 @@ public void keyPressed(KeyEvent e) {
170173
btnNewButton_3 = new JButton("Audit");
171174
btnNewButton_3.addActionListener(new ActionListener() {
172175
public void actionPerformed(ActionEvent e) {
173-
//TODO
176+
177+
setCentralText(mainController.getAuditRaport());
178+
174179
}
175180
});
176181
getContentPane().add(btnNewButton_3, "cell 3 1");
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package com.Polodz.controller;
2+
3+
import java.io.Serializable;
4+
5+
public class AuditRaport implements Serializable {
6+
7+
/**
8+
*
9+
*/
10+
private static final long serialVersionUID = 5823829955504180090L;
11+
12+
private final String epiloque= "Full incomin: \n";
13+
private Integer numberOfFullAudience=0;
14+
15+
private String errorBuffor="Warning for: \n";
16+
17+
public void addToAudience(Integer extension) {
18+
this.numberOfFullAudience+=extension;
19+
}
20+
21+
public void addToErrorBuffor(String extension) {
22+
this.errorBuffor += extension;
23+
}
24+
25+
public Integer getNumberOfFullAudience() {
26+
return numberOfFullAudience;
27+
}
28+
29+
private String getErrorBuffor() {
30+
return errorBuffor;
31+
}
32+
33+
public String getRaportText() {
34+
String text = this.epiloque+this.getNumberOfFullAudience() +"\n";
35+
if ( errorBuffor.length()!="Warning for: \n".length())
36+
text+=this.errorBuffor+" are corrupted. Please restart application. If problem would occure more times please conntact superadmin";
37+
return text;
38+
}
39+
40+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@ public interface IMainController {
77
public MainWindow getView();
88
public void setRentWebItems(String input);
99
void deleteMembersProduct(Long memberId,Integer index);
10+
public String getServerResponse(String input);
11+
public String getItemInfo(Long long1, int index);
12+
public String getAuditRaport();
13+
1014

1115
}

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

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import com.Polodz.View.MainWindow;
2323
import com.Polodz.model.MembersFactory;
2424
import com.Polodz.model.StringWebData;
25+
import com.Polodz.model.Config;
26+
import com.Polodz.model.IItem;
2527
import com.Polodz.model.IMember;
2628
import com.Polodz.model.MembersDAO;
2729
import com.Polodz.service.TelnetConnector;
@@ -39,13 +41,13 @@ public void test() {
3941
private MembersDAO membersDAO;
4042

4143
@Autowired
42-
public IController telentController;
44+
private IController telentController;
4345

4446
@Autowired
45-
public WebMovieListController webDataHandler;
47+
private WebMovieListController webDataHandler;
4648

4749
@Autowired
48-
public MainWindow mainView;
50+
private MainWindow mainView;
4951

5052

5153
public MainController() {
@@ -130,7 +132,43 @@ public List<IMember> listAll() {
130132

131133
@Override
132134
public void deleteMembersProduct(Long memberId,Integer index) {
133-
this.membersDAO.getMembersAudience().get(memberId.intValue()).addItems().remove((int)index);
135+
IMember delatingItemsMember = this.membersDAO.getMembersAudience().get(memberId.intValue());
136+
this.getServerResponse(delatingItemsMember.getName()+ "delete");
137+
delatingItemsMember.getItems().remove((int)index);
138+
}
139+
140+
@Override
141+
public String getItemInfo(Long memberId, int index) {
142+
IItem chosenItem= this.membersDAO.getMembersAudience().get(memberId.intValue()).getItems().get(index);
143+
String bufforToWork=null;
144+
bufforToWork+="Status: \n Name: "+chosenItem.getName()+"\n";
145+
bufforToWork+="Ticket price: "+chosenItem.getPrice()+"\n";
146+
bufforToWork+="Audience: "+this.getServerResponse(chosenItem.getId().toString())+"\n";
147+
//bufforToWork+="Rate: "+this.filmWebMovie.getRate()+"\n";
148+
//bufforToWork+="Interested: "+this.filmWebMovie.getInterested()+"\n";
149+
return bufforToWork;
150+
}
151+
152+
@Override
153+
public String getAuditRaport() {
154+
AuditRaport raport= new AuditRaport();
155+
if (membersDAO.getMembersAudience()!=null)
156+
membersDAO.getMembersAudience().parallelStream().forEach(
157+
cur->{
158+
if (cur.getItems()!=null)
159+
cur.getItems().parallelStream().forEach(
160+
current->{
161+
try {
162+
raport.addToAudience(Integer.valueOf(this.getServerResponse(current.getId().toString())));
163+
} catch (Exception e) {
164+
raport.addToErrorBuffor(current.getName()+" movie for id "+current.getId().toString()+ "\n");
165+
}
166+
});
167+
168+
});
169+
else return Config.NoAuditToShow.getMessage();
170+
171+
return raport.getRaportText();
134172

135173
}
136174

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.Polodz.model;
2+
3+
public enum Config {
4+
MovieTicketCost(12.0),
5+
NoAuditToShow("No any avalible Networ");
6+
private Double value;
7+
private String message;
8+
private Config(Double value) {
9+
this.value=value;
10+
}
11+
private Config(String message) {
12+
this.message=message;
13+
}
14+
public Double getCost() {
15+
return getValue();
16+
}
17+
18+
public Double getValue() {
19+
return value;
20+
}
21+
public String getMessage() {
22+
return message;
23+
}
24+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
public interface IItem {
44
public String getName();
55
public Long getId();
6+
public Double getPrice();
7+
public Integer getSoldTicketsNumber();
68
}

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public IDao create(IController arg) {
4444
arg.execute(" ");
4545
String membersNameList = arg.execute("list");
4646
//log.info(membersNameList+"Spis");
47-
String[] memberNameSrcLine= membersNameList.split("\\r?\\n");
48-
for (int i = 0; i < memberNameSrcLine.length; i++) {
49-
String memmbersName = memberNameSrcLine[i].split(" ")[0];
47+
String[] memberNameSourceLine= membersNameList.split("\\r?\\n");
48+
for (int i = 0; i < memberNameSourceLine.length; i++) {
49+
String memmbersName = memberNameSourceLine[i].split(" ")[0];
5050
//log.info(memmbersName);
5151
Member memberToAdd= new Member();
5252
String itemsMemeber = arg.execute(memmbersName);
@@ -55,15 +55,18 @@ public IDao create(IController arg) {
5555
memberToAdd.setItems(newMemebersBasket);
5656
if (itemsMemeber!=null) {
5757
Arrays.stream(itemsMemeber.split("\\r?\\n")).forEach( itemName -> {
58+
String[] itemNameProperties = itemName.split(" ");
5859
Movie toAdd = new Movie();
59-
toAdd.setName(itemName);
60+
toAdd.setName(itemNameProperties[0]);
61+
toAdd.setId(new Long(itemNameProperties[1]));
6062
memberToAdd.addItems().add(toAdd);
6163
//log.info(itemName);
6264
});
6365
}
6466
//memberToAdd.getItems().forEach(action);
6567
//log.info(((Movie) memberToAdd.addItems().get(0)).getName()+"TOOOO");
6668
//log.info(memberToAdd.getItems().get(0).getName());
69+
memberToAdd.setId(i);
6770
memberToAdd.setName(memmbersName);
6871
result.addNode(memberToAdd);
6972
}

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ public class Movie implements IItem {
44

55
private String name;
66
private Long id;
7-
7+
private final Double price = Config.MovieTicketCost.getCost();
8+
private Integer soldTicketsNumer;
9+
810
public void setName(String name) {
911
this.name = name;
1012
}
@@ -13,6 +15,10 @@ public void setId(Long id) {
1315
this.id = id;
1416
}
1517

18+
public void setSoldTicketsNumber(Integer soldTickets) {
19+
this.soldTicketsNumer = soldTickets;
20+
}
21+
1622
@Override
1723
public String getName() {
1824
// TODO Auto-generated method stub
@@ -25,4 +31,12 @@ public Long getId() {
2531
return this.id;
2632
}
2733

34+
public Double getPrice() {
35+
return price;
36+
}
37+
38+
public Integer getSoldTicketsNumber() {
39+
return soldTicketsNumer;
40+
}
41+
2842
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class GrownApplicationTests {
4646
public void setup(){
4747
MockitoAnnotations.initMocks(this);
4848
when(telnetHandler.get("list")).thenReturn("test\ntest1\ntest2\ntest3\ntest4\ntest5");
49-
when(telnetHandler.get("test")).thenReturn("mtest\nmtest1\nmtest2\nmtest3\nmtest4\nmtest5");
49+
when(telnetHandler.get("test")).thenReturn("mtest 1\nmtest1 2\nmtest2 3\nmtest3 4\nmtest4 5\nmtest5 6");
5050
reset(telnetHandler);
5151
//BeanFactory= context.getBean(BeanFactory.class);
5252
}
@@ -82,7 +82,7 @@ public ITelnet TelnetConnector() {
8282
if (telnetHandler==null) {
8383
telnetHandler=mock(TelnetConnector.class);
8484
when(telnetHandler.get("list")).thenReturn("test\ntest1\ntest2\ntest3\ntest4\ntest5");
85-
when(telnetHandler.get(startsWith("test"))).thenReturn("mtest\nmtest1\nmtest2\nmtest3\nmtest4\nmtest5");
85+
when(telnetHandler.get(startsWith("test"))).thenReturn("mtest 1\nmtest1 2\nmtest2 3\nmtest3 4\nmtest4 5\nmtest5 6");
8686
}
8787
return telnetHandler;
8888
}

0 commit comments

Comments
 (0)