Skip to content

Commit 5c3b29c

Browse files
phasenraum2010phasenraum2010
committed
bugfixes from Testing
1 parent 7aac0e9 commit 5c3b29c

File tree

7 files changed

+119
-5
lines changed

7 files changed

+119
-5
lines changed

‎src/main/java/org/woehlke/twitterwall/frontend/controller/UserListController.java‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,46 @@ public String getUserListForId(
6767
return "userlist/id";
6868
}
6969

70+
//TODO: jdscdgsv
71+
@RequestMapping("/list/userList2Subcriber")
72+
public String userList2Subcriber(
73+
@RequestParam(name= "page", defaultValue=""+ ContentFactory.FIRST_PAGE_NUMBER) int page,
74+
Model model
75+
) {
76+
Pageable pageRequest = new PageRequest(
77+
page,
78+
frontendProperties.getPageSize(),
79+
Sort.Direction.ASC,
80+
"slug"
81+
);
82+
Page<UserList> userlists = userListService.getAll(pageRequest);
83+
model.addAttribute("myPageContent", userlists);
84+
String symbol = Symbols.USER_ALL.toString();
85+
String subtitle = "All Users";
86+
model = contentFactory.setupPage(model, title, subtitle, symbol);
87+
return "userlist/all";
88+
}
89+
90+
//TODO: jdscdgsv
91+
@RequestMapping("/list/userList2Members")
92+
public String userList2Members(
93+
@RequestParam(name= "page", defaultValue=""+ ContentFactory.FIRST_PAGE_NUMBER) int page,
94+
Model model
95+
) {
96+
Pageable pageRequest = new PageRequest(
97+
page,
98+
frontendProperties.getPageSize(),
99+
Sort.Direction.ASC,
100+
"slug"
101+
);
102+
Page<UserList> userlists = userListService.getAll(pageRequest);
103+
model.addAttribute("myPageContent", userlists);
104+
String symbol = Symbols.USER_ALL.toString();
105+
String subtitle = "All Users";
106+
model = contentFactory.setupPage(model, title, subtitle, symbol);
107+
return "userlist/all";
108+
}
109+
70110
private static final Logger log = LoggerFactory.getLogger(UserController.class);
71111

72112
private final UserListService userListService;

‎src/main/java/org/woehlke/twitterwall/oodm/model/TaskHistory.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ public class TaskHistory implements DomainObjectMinimal<TaskHistory> {
6868
@JoinColumn(name="task_id")
6969
private Task task;
7070

71-
//@NotNull
7271
@Valid
7372
@Embedded
7473
@AttributeOverrides({
@@ -91,7 +90,9 @@ public class TaskHistory implements DomainObjectMinimal<TaskHistory> {
9190
@AttributeOverride(name = "userprofile2media", column = @Column(name = "count_userprofile2media",nullable=false)),
9291
@AttributeOverride(name = "userprofile2mention", column = @Column(name = "count_userprofile2mention",nullable=false)),
9392
@AttributeOverride(name = "userprofile2tickersymbol", column = @Column(name = "count_userprofile2tickersymbol",nullable=false)),
94-
@AttributeOverride(name = "userprofile2url", column = @Column(name = "count_userprofile2url",nullable=false))
93+
@AttributeOverride(name = "userprofile2url", column = @Column(name = "count_userprofile2url",nullable=false)),
94+
@AttributeOverride(name = "userList2Members", column = @Column(name = "count_userlist2members",nullable=false)),
95+
@AttributeOverride(name = "userList2Subcriber", column = @Column(name = "count_userlist2subcriber",nullable=false))
9596
})
9697
private CountedEntities countedEntities = new CountedEntities();
9798

‎src/main/java/org/woehlke/twitterwall/oodm/model/UserList.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import static javax.persistence.CascadeType.DETACH;
1515
import static javax.persistence.CascadeType.REFRESH;
1616
import static javax.persistence.CascadeType.REMOVE;
17-
import static javax.persistence.FetchType.EAGER;
1817
import static javax.persistence.FetchType.LAZY;
1918

2019
@Entity

‎src/main/java/org/woehlke/twitterwall/oodm/model/parts/CountedEntities.java‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ public class CountedEntities implements Serializable,DomainObjectWithValidation
7676
@NotNull
7777
private Long userprofile2url=0L;
7878

79+
@NotNull
80+
private Long userList2Members=0L;
81+
82+
@NotNull
83+
private Long userList2Subcriber=0L;
84+
7985
public CountedEntities() {
8086
}
8187

@@ -100,7 +106,9 @@ public Long getTotalNumberOfRows(){
100106
userprofile2media +
101107
userprofile2mention +
102108
userprofile2tickersymbol +
103-
userprofile2url;
109+
userprofile2url +
110+
userList2Members +
111+
userList2Subcriber;
104112
}
105113

106114
public Long getCountUser() {
@@ -263,6 +271,22 @@ public void setUserprofile2url(Long userprofile2url) {
263271
this.userprofile2url = userprofile2url;
264272
}
265273

274+
public Long getUserList2Members() {
275+
return userList2Members;
276+
}
277+
278+
public void setUserList2Members(Long userList2Members) {
279+
this.userList2Members = userList2Members;
280+
}
281+
282+
public Long getUserList2Subcriber() {
283+
return userList2Subcriber;
284+
}
285+
286+
public void setUserList2Subcriber(Long userList2Subcriber) {
287+
this.userList2Subcriber = userList2Subcriber;
288+
}
289+
266290
@Override
267291
public String toString() {
268292
return "CountedEntities{" +
@@ -286,6 +310,8 @@ public String toString() {
286310
", userprofile2mention=" + userprofile2mention +
287311
", userprofile2tickersymbol=" + userprofile2tickersymbol +
288312
", userprofile2url=" + userprofile2url +
313+
", countUserList2Members=" + userList2Members +
314+
", countUserList2Subcriber=" + userList2Subcriber +
289315
'}';
290316
}
291317

@@ -334,7 +360,11 @@ public boolean equals(Object o) {
334360
return false;
335361
if (getUserprofile2tickersymbol() != null ? !getUserprofile2tickersymbol().equals(that.getUserprofile2tickersymbol()) : that.getUserprofile2tickersymbol() != null)
336362
return false;
337-
return getUserprofile2url() != null ? getUserprofile2url().equals(that.getUserprofile2url()) : that.getUserprofile2url() == null;
363+
if (getUserprofile2url() != null ? !getUserprofile2url().equals(that.getUserprofile2url()) : that.getUserprofile2url() != null)
364+
return false;
365+
if (getUserList2Members() != null ? !getUserList2Members().equals(that.getUserList2Members()) : that.getUserList2Members() != null)
366+
return false;
367+
return getUserList2Subcriber() != null ? getUserList2Subcriber().equals(that.getUserList2Subcriber()) : that.getUserList2Subcriber() == null;
338368
}
339369

340370
@Override
@@ -359,6 +389,8 @@ public int hashCode() {
359389
result = 31 * result + (getUserprofile2mention() != null ? getUserprofile2mention().hashCode() : 0);
360390
result = 31 * result + (getUserprofile2tickersymbol() != null ? getUserprofile2tickersymbol().hashCode() : 0);
361391
result = 31 * result + (getUserprofile2url() != null ? getUserprofile2url().hashCode() : 0);
392+
result = 31 * result + (getUserList2Members() != null ? getUserList2Members().hashCode() : 0);
393+
result = 31 * result + (getUserList2Subcriber() != null ? getUserList2Subcriber().hashCode() : 0);
362394
return result;
363395
}
364396

@@ -425,6 +457,12 @@ public boolean isValid() {
425457
if(userprofile2url == null){
426458
return false;
427459
}
460+
if(userList2Members == null){
461+
return false;
462+
}
463+
if(userList2Subcriber == null){
464+
return false;
465+
}
428466
if(countUser < 0){
429467
return false;
430468
}
@@ -479,6 +517,12 @@ public boolean isValid() {
479517
if(userprofile2url < 0){
480518
return false;
481519
}
520+
if(userList2Members < 0){
521+
return false;
522+
}
523+
if(userList2Subcriber < 0){
524+
return false;
525+
}
482526
return true;
483527
}
484528
}

‎src/main/java/org/woehlke/twitterwall/oodm/repositories/custom/UserListRepositoryCustom.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
package org.woehlke.twitterwall.oodm.repositories.custom;
22

3+
import org.springframework.data.jpa.repository.Query;
34
import org.woehlke.twitterwall.oodm.model.UserList;
45
import org.woehlke.twitterwall.oodm.repositories.common.DomainObjectMinimalRepository;
56

67
public interface UserListRepositoryCustom extends DomainObjectMinimalRepository<UserList> {
78

89
UserList findByUniqueId(UserList domainObject);
10+
11+
@Query(name="UserList.countUserList2Subcriber",nativeQuery=true)
12+
long countUserList2Subcriber();
13+
14+
@Query(name="UserList.countUserList2Members",nativeQuery=true)
15+
long countUserList2Members();
916
}

‎src/main/java/org/woehlke/twitterwall/oodm/service/impl/CountedEntitiesServiceImpl.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ public CountedEntities countAll() {
5858
c.setUserprofile2tickersymbol(userRepository.countAllUser2TickerSymbol());
5959
c.setUserprofile2url(userRepository.countAllUser2Url());
6060

61+
c.setUserList2Subcriber(userListRepository.countUserList2Subcriber());
62+
c.setUserList2Members(userListRepository.countUserList2Members());
63+
6164
log.debug(msg+c.toString());
6265
return c;
6366
}

‎src/main/resources/templates/application/domain/count.html‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,26 @@ <h3>Count Entities:</h3>
262262
</div>
263263
<div class="col-md-7"></div>
264264
</div>
265+
<div class="row">
266+
<div class="col-md-4">
267+
<i class="fa fa-check-square-o" aria-hidden="true"></i>
268+
<a th:href="@{/userlist/list/userList2Members}">userList2Members:</a>
269+
</div>
270+
<div class="col-md-1 text-right">
271+
<span th:text="${countedEntities.userList2Members}">userList2Members</span>
272+
</div>
273+
<div class="col-md-7"></div>
274+
</div>
275+
<div class="row">
276+
<div class="col-md-4">
277+
<i class="fa fa-check-square-o" aria-hidden="true"></i>
278+
<a th:href="@{/userlist/list/userList2Subcriber}">userList2Subcriber:</a>
279+
</div>
280+
<div class="col-md-1 text-right">
281+
<span th:text="${countedEntities.userList2Subcriber}">userList2Subcriber</span>
282+
</div>
283+
<div class="col-md-7"></div>
284+
</div>
265285
<div class="row">
266286
<div class="col-md-12"><hr/></div>
267287
</div>

0 commit comments

Comments
 (0)