romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

#112 ping model changed

Browse Source
This commit is contained in:
Artem.Arefev 2019-06-02 21:53:51 +04:00
parent 3898dcf1c1
commit abea3c7dad
18 changed files with 63 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/ru/ulstu/conference/model/Conference.java
View File

@ -8,11 +8,11 @@ import ru.ulstu.core.model.BaseEntity;
import ru.ulstu.core.model.UserActivity;
import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.paper.model.Paper;
import ru.ulstu.ping.model.Ping;
import ru.ulstu.user.model.User;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
@ -33,6 +33,7 @@ import java.util.stream.Collectors;
@Entity
@Table(name = "conference")
@DiscriminatorValue("CONFERENCE")
public class Conference extends BaseEntity implements UserActivity {
@NotBlank
@ -72,11 +73,6 @@ public class Conference extends BaseEntity implements UserActivity {
@Fetch(FetchMode.SUBSELECT)
private List<ConferenceUser> users = new ArrayList<>();
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@JoinColumn(name = "conference_id")
@Fetch(FetchMode.SUBSELECT)
private List<Ping> pings;
public String getTitle() {
return title;
}
@ -162,13 +158,4 @@ public class Conference extends BaseEntity implements UserActivity {
public Set<User> getActivityUsers() {
return getUsers().stream().map(ConferenceUser::getUser).collect(Collectors.toSet());
}
public void addPing(Ping ping) {
this.pings.add(ping);
}
@Override
public List<Ping> getPings() {
return this.pings;
}
}

5
src/main/java/ru/ulstu/conference/service/ConferenceService.java
View File

@ -242,10 +242,9 @@ public class ConferenceService extends BaseService {
}
@Transactional
public Ping ping(ConferenceDto conferenceDto) throws IOException {
Ping ping = pingService.addPing(findOne(conferenceDto.getId()));
public void ping(ConferenceDto conferenceDto) throws IOException {
pingService.addPing(findOne(conferenceDto.getId()));
conferenceRepository.updatePingConference(conferenceDto.getId());
return ping;
}
private Conference findOne(Integer conferenceId) {

4
src/main/java/ru/ulstu/core/model/UserActivity.java
View File

@ -1,14 +1,10 @@
package ru.ulstu.core.model;
import ru.ulstu.ping.model.Ping;
import ru.ulstu.user.model.User;
import java.util.List;
import java.util.Set;
public interface UserActivity {
String getTitle();
Set<User> getActivityUsers();
void addPing(Ping ping);
List<Ping> getPings();
}

17
src/main/java/ru/ulstu/grant/model/Grant.java
View File

@ -8,12 +8,12 @@ import ru.ulstu.core.model.UserActivity;
import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.file.model.FileData;
import ru.ulstu.paper.model.Paper;
import ru.ulstu.ping.model.Ping;
import ru.ulstu.project.model.Project;
import ru.ulstu.timeline.model.Event;
import ru.ulstu.user.model.User;
import javax.persistence.CascadeType;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@ -36,6 +36,7 @@ import java.util.Set;
@Entity
@Table(name = "grants")
@DiscriminatorValue("GRANT")
public class Grant extends BaseEntity implements UserActivity {
public enum GrantStatus {
APPLICATION("Заявка"),
@ -99,11 +100,6 @@ public class Grant extends BaseEntity implements UserActivity {
@JoinColumn(name = "grant_id")
private List<Event> events = new ArrayList<>();
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@JoinColumn(name = "grant_id")
@Fetch(FetchMode.SUBSELECT)
private List<Ping> pings;
public GrantStatus getStatus() {
return status;
}
@ -197,13 +193,4 @@ public class Grant extends BaseEntity implements UserActivity {
.filter(d -> d.getDate().after(new Date()))
.findFirst();
}
public void addPing(Ping ping) {
this.pings.add(ping);
}
@Override
public List<Ping> getPings() {
return this.pings;
}
}

5
src/main/java/ru/ulstu/grant/service/GrantService.java
View File

@ -17,7 +17,6 @@ import ru.ulstu.name.BaseService;
import ru.ulstu.paper.model.Paper;
import ru.ulstu.paper.model.PaperDto;
import ru.ulstu.paper.service.PaperService;
import ru.ulstu.ping.model.Ping;
import ru.ulstu.ping.service.PingService;
import ru.ulstu.project.model.Project;
import ru.ulstu.project.model.ProjectDto;
@ -348,8 +347,6 @@ public class GrantService extends BaseService {
@Transactional
public void ping(int grantId) throws IOException {
Grant grant = findById(grantId);
grant.addPing(new Ping(new Date(), userService.getCurrentUser()));
grantRepository.save(grant);
pingService.addPing(findById(grantId));
}
}

17
src/main/java/ru/ulstu/paper/model/Paper.java
View File

@ -9,12 +9,12 @@ import ru.ulstu.core.model.UserActivity;
import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.file.model.FileData;
import ru.ulstu.grant.model.Grant;
import ru.ulstu.ping.model.Ping;
import ru.ulstu.timeline.model.Event;
import ru.ulstu.user.model.User;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@ -35,6 +35,7 @@ import java.util.Optional;
import java.util.Set;
@Entity
@DiscriminatorValue("PAPER")
public class Paper extends BaseEntity implements UserActivity {
public enum PaperStatus {
ATTENTION("Обратить внимание"),
@ -129,11 +130,6 @@ public class Paper extends BaseEntity implements UserActivity {
@Fetch(FetchMode.SUBSELECT)
private List<Reference> references = new ArrayList<>();
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@JoinColumn(name = "paper_id")
@Fetch(FetchMode.SUBSELECT)
private List<Ping> pings;
public PaperStatus getStatus() {
return status;
}
@ -316,13 +312,4 @@ public class Paper extends BaseEntity implements UserActivity {
public int hashCode() {
return Objects.hash(super.hashCode(), title, status, type, createDate, updateDate, deadlines, comment, url, locked, events, files, authors, latexText, conferences, grants);
}
public void addPing(Ping ping) {
this.pings.add(ping);
}
@Override
public List<Ping> getPings() {
return this.pings;
}
}

5
src/main/java/ru/ulstu/paper/service/PaperService.java
View File

@ -15,7 +15,6 @@ import ru.ulstu.paper.model.Reference;
import ru.ulstu.paper.model.ReferenceDto;
import ru.ulstu.paper.repository.PaperRepository;
import ru.ulstu.paper.repository.ReferenceRepository;
import ru.ulstu.ping.model.Ping;
import ru.ulstu.ping.service.PingService;
import ru.ulstu.timeline.service.EventService;
import ru.ulstu.user.model.User;
@ -394,8 +393,6 @@ public class PaperService {
@Transactional
public void ping(int paperId) throws IOException {
Paper paper = findPaperById(paperId);
paper.addPing(new Ping(new Date(), userService.getCurrentUser()));
paperRepository.save(paper);
pingService.addPing(findPaperById(paperId));
}
}

105
src/main/java/ru/ulstu/ping/model/Ping.java
View File

@ -1,6 +1,8 @@
package ru.ulstu.ping.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.hibernate.annotations.Any;
import org.hibernate.annotations.AnyMetaDef;
import org.hibernate.annotations.MetaValue;
import org.springframework.format.annotation.DateTimeFormat;
import ru.ulstu.conference.model.Conference;
import ru.ulstu.core.model.BaseEntity;
@ -10,7 +12,9 @@ import ru.ulstu.paper.model.Paper;
import ru.ulstu.project.model.Project;
import ru.ulstu.user.model.User;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
@ -29,21 +33,24 @@ public class Ping extends BaseEntity {
@JoinColumn(name = "users_id")
private User user;
@ManyToOne()
@JoinColumn(name = "conference_id")
private Conference conference;
@Column(name = "activity_type", insertable = false, updatable = false)
private String activityType;
@ManyToOne()
@JoinColumn(name = "paper_id")
private Paper paper;
@ManyToOne()
@JoinColumn(name = "grant_id")
private Grant grant;
@ManyToOne()
@JoinColumn(name = "project_id")
private Project project;
@Any(
metaColumn = @Column(name = "activity_type"),
fetch = FetchType.LAZY
)
@AnyMetaDef(
idType = "integer", metaType = "string",
metaValues = {
@MetaValue(targetEntity = Conference.class, value = "CONFERENCE"),
@MetaValue(targetEntity = Paper.class, value = "PAPER"),
@MetaValue(targetEntity = Project.class, value = "PROJECT"),
@MetaValue(targetEntity = Grant.class, value = "GRANT")
}
)
@JoinColumn(name = "activity_id")
private UserActivity activity;
public Ping() {
}
@ -53,16 +60,6 @@ public class Ping extends BaseEntity {
this.user = user;
}
public Ping(@JsonProperty("id") Integer id,
@JsonProperty("date") Date date,
@JsonProperty("user") User user,
@JsonProperty("conference") Conference conference) {
setId(id);
this.date = date;
this.user = user;
this.conference = conference;
}
public Date getDate() {
return date;
}
@ -79,59 +76,11 @@ public class Ping extends BaseEntity {
this.user = user;
}
public Conference getConference() {
return conference;
}
public void setConference(Conference conference) {
this.conference = conference;
}
public Paper getPaper() {
return paper;
}
public void setPaper(Paper paper) {
this.paper = paper;
}
public Grant getGrant() {
return grant;
}
public void setGrant(Grant grant) {
this.grant = grant;
}
public Project getProject() {
return project;
}
public void setProject(Project project) {
this.project = project;
}
public <T> void setActivity(T object) {
if (object.getClass() == Conference.class) {
this.conference = (Conference) object;
} else if (object.getClass() == Project.class) {
this.project = (Project) object;
} else if (object.getClass() == Grant.class) {
this.grant = (Grant) object;
} else if (object.getClass() == Paper.class) {
this.paper = (Paper) object;
}
}
public UserActivity getActivity() {
if (conference != null) {
return conference;
} else if (project != null) {
return project;
} else if (paper != null) {
return paper;
} else {
return grant;
}
return this.activity;
}
public void setActivity(UserActivity activity) {
this.activity = activity;
}
}

6
src/main/java/ru/ulstu/ping/repository/PingRepository.java
View File

@ -11,12 +11,10 @@ import java.util.List;
public interface PingRepository extends JpaRepository<Ping, Integer> {
@Query("SELECT count(*) FROM Ping p WHERE (DAY(p.date) = :day) AND (MONTH(p.date) = :month) AND (YEAR(p.date) = :year) AND (p.conference = :conference)")
@Query("SELECT count(*) FROM Ping p WHERE (DAY(p.date) = :day) AND (MONTH(p.date) = :month) AND (YEAR(p.date) = :year) AND (p.activityType = 'conference') AND (p.activity = :conference)")
long countByConferenceAndDate(@Param("conference") Conference conference, @Param("day") Integer day, @Param("month") Integer month, @Param("year") Integer year);
@Query("SELECT p FROM Ping p WHERE (:activity != 'conferences' OR p.conference IS NOT NULL) " +
"AND (:activity != 'papers' OR p.paper IS NOT NULL) AND (:activity != 'projects' OR p.project IS NOT NULL) " +
"AND (:activity != 'grants' OR p.grant IS NOT NULL)")
@Query("SELECT p FROM Ping p WHERE (:activity = '' OR p.activityType = :activity)")
List<Ping> getPings(@Param("activity") String activity);
@Query("SELECT p FROM Ping p WHERE (:dateFrom < date)")

4
src/main/java/ru/ulstu/ping/service/PingService.java
View File

@ -3,6 +3,7 @@ package ru.ulstu.ping.service;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ru.ulstu.conference.model.Conference;
import ru.ulstu.core.model.UserActivity;
import ru.ulstu.ping.model.Ping;
import ru.ulstu.ping.repository.PingRepository;
import ru.ulstu.user.service.UserService;
@ -27,8 +28,7 @@ public class PingService {
}
@Transactional
public <T> Ping addPing(T activity) throws IOException {
pingScheduler.sendPingsInfo();
public Ping addPing(UserActivity activity) throws IOException {
Ping newPing = new Ping(new Date(), userService.getCurrentUser());
newPing.setActivity(activity);
return pingRepository.save(newPing);

27
src/main/java/ru/ulstu/project/model/Project.java
View File

@ -1,17 +1,15 @@
package ru.ulstu.project.model;
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
import org.hibernate.validator.constraints.NotBlank;
import ru.ulstu.core.model.BaseEntity;
import ru.ulstu.core.model.UserActivity;
import ru.ulstu.deadline.model.Deadline;
import ru.ulstu.file.model.FileData;
import ru.ulstu.grant.model.Grant;
import ru.ulstu.ping.model.Ping;
import ru.ulstu.user.model.User;
import javax.persistence.CascadeType;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@ -27,11 +25,8 @@ import java.util.List;
import java.util.Set;
@Entity
@DiscriminatorValue("PROJECT")
public class Project extends BaseEntity implements UserActivity {
@Override
public Set<User> getActivityUsers() {
return new HashSet<>();
}
public enum ProjectStatus {
TECHNICAL_TASK("Техническое задание"),
@ -79,10 +74,10 @@ public class Project extends BaseEntity implements UserActivity {
@ManyToMany(fetch = FetchType.LAZY)
private List<User> executors = new ArrayList<>();
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@JoinColumn(name = "project_id")
@Fetch(FetchMode.SUBSELECT)
private List<Ping> pings = new ArrayList<>();
// @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
// @JoinColumn(name = "project_id")
// @Fetch(FetchMode.SUBSELECT)
// private List<Ping> pings = new ArrayList<>();
public String getTitle() {
return title;
@ -149,15 +144,11 @@ public class Project extends BaseEntity implements UserActivity {
}
public Set<User> getUsers() {
return new HashSet<User>(getExecutors());
}
public void addPing(Ping ping) {
this.pings.add(new Ping());
return new HashSet<>(getExecutors());
}
@Override
public List<Ping> getPings() {
return this.pings;
public Set<User> getActivityUsers() {
return new HashSet<>();
}
}

6
src/main/java/ru/ulstu/project/service/ProjectService.java
View File

@ -6,7 +6,6 @@ import org.thymeleaf.util.StringUtils;
import ru.ulstu.deadline.service.DeadlineService;
import ru.ulstu.file.service.FileService;
import ru.ulstu.grant.repository.GrantRepository;
import ru.ulstu.ping.model.Ping;
import ru.ulstu.ping.service.PingService;
import ru.ulstu.project.model.Project;
import ru.ulstu.project.model.ProjectDto;
@ -16,7 +15,6 @@ import ru.ulstu.user.service.UserService;
import java.io.IOException;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import static org.springframework.util.ObjectUtils.isEmpty;
@ -133,8 +131,6 @@ public class ProjectService {
@Transactional
public void ping(int projectId) throws IOException {
Project project = findById(projectId);
project.addPing(new Ping(new Date(), userService.getCurrentUser()));
projectRepository.save(project);
pingService.addPing(findById(projectId));
}
}

8
src/main/java/ru/ulstu/user/controller/UserMvcController.java
View File

@ -65,10 +65,10 @@ public class UserMvcController extends OdinController<UserListDto, UserDto> {
@ModelAttribute("allActivities")
public Map<String, String> getAllActivites() {
return ImmutableMap.of("papers", "Статьи",
"grants", "Гранты",
"projects", "Проекты",
"conferences", "Конференции");
return ImmutableMap.of("PAPER", "Статьи",
"GRANT", "Гранты",
"PROJECT", "Проекты",
"CONFERENCE", "Конференции");
}
@GetMapping("/pings")

31
src/main/java/ru/ulstu/user/service/UserService.java
View File

@ -14,7 +14,6 @@ import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import ru.ulstu.conference.model.Conference;
import ru.ulstu.conference.service.ConferenceService;
import ru.ulstu.configuration.ApplicationProperties;
import ru.ulstu.core.error.EntityIdIsNullException;
@ -82,9 +81,6 @@ public class UserService implements UserDetailsService {
private final ConferenceService conferenceService;
private final UserSessionService userSessionService;
private final PingService pingService;
private final PaperService paperService;
private final ProjectService projectService;
private final GrantService grantService;
public UserService(UserRepository userRepository,
PasswordEncoder passwordEncoder,
@ -94,10 +90,7 @@ public class UserService implements UserDetailsService {
ApplicationProperties applicationProperties,
@Lazy PingService pingService,
@Lazy ConferenceService conferenceRepository,
@Lazy UserSessionService userSessionService,
@Lazy PaperService paperService,
@Lazy ProjectService projectService,
@Lazy GrantService grantService) throws ParseException {
@Lazy UserSessionService userSessionService) throws ParseException {
this.userRepository = userRepository;
this.passwordEncoder = passwordEncoder;
this.userRoleRepository = userRoleRepository;
@ -108,9 +101,6 @@ public class UserService implements UserDetailsService {
this.timetableService = new TimetableService();
this.userSessionService = userSessionService;
this.pingService = pingService;
this.paperService = paperService;
this.projectService = projectService;
this.grantService = grantService;
}
private User getUserByEmail(String email) {
@ -418,24 +408,9 @@ public class UserService implements UserDetailsService {
}
Map<String, Integer> activitiesPings = new HashMap<>();
List<? extends UserActivity> activities = new ArrayList<>();
for (Ping ping : pingService.getPings(activityName)) {
UserActivity activity = ping.getActivity();
switch (activityName) {
case "conferences":
activities = conferenceService.findAll();
break;
case "papers":
activities = paperService.findAll();
break;
case "projects":
activities = projectService.findAll();
break;
case "grants":
activities = grantService.findAll();
break;
}
for (UserActivity activity : activities) {
if (user != null && !activity.getActivityUsers().contains(user)) {
continue;
}

4
src/main/resources/application.properties
View File

@ -24,7 +24,7 @@ spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFact
# JPA Settings
spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker
spring.datasource.username=postgres
spring.datasource.password=password
spring.datasource.password=postgres
spring.datasource.driverclassName=org.postgresql.Driver
spring.jpa.hibernate.ddl-auto=validate
# Liquibase Settings
@ -34,7 +34,7 @@ liquibase.change-log=classpath:db/changelog-master.xml
# Application Settings
ng-tracker.base-url=http://127.0.0.1:8080
ng-tracker.undead-user-login=admin
ng-tracker.dev-mode=false
ng-tracker.dev-mode=true
ng-tracker.debug_email=
ng-tracker.use-https=false
ng-tracker.check-run=false

11
src/main/resources/db/changelog-20190531_000000-schema.xml
View File

@ -4,15 +4,8 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<changeSet author="arefyev" id="20190525_000000-1">
<addColumn tableName="ping">
<column name="paper_id" type="integer"/>
<column name="grant_id" type="integer"/>
<column name="project_id" type="integer"/>
<column name="activity_type" type="varchar(20)"/>
<column name="activity_id" type="integer"/>
</addColumn>
<addForeignKeyConstraint baseTableName="ping" baseColumnNames="paper_id" constraintName="paper_fk" referencedTableName="paper"
referencedColumnNames="id"/>
<addForeignKeyConstraint baseTableName="ping" baseColumnNames="grant_id" constraintName="grant_fk" referencedTableName="grants"
referencedColumnNames="id"/>
<addForeignKeyConstraint baseTableName="ping" baseColumnNames="project_id" constraintName="project_fk" referencedTableName="project"
referencedColumnNames="id"/>
</changeSet>
</databaseChangeLog>

1
src/main/resources/templates/papers/paper.html
View File

@ -562,6 +562,7 @@
$(this).autocomplete("search");
});
/*]]>*/
</script>
</div>

10
src/test/java/ru/ulstu/conference/service/ConferenceServiceTest.java
View File

@ -276,14 +276,4 @@ public class ConferenceServiceTest {
assertTrue(conferenceService.isAttachedToConference(ID));
}
@Test
public void ping() throws IOException {
Ping ping = new Ping();
when(conferenceRepository.findOne(ID)).thenReturn(conferenceWithId);
when(pingService.addPing(conferenceWithId)).thenReturn(ping);
when(conferenceRepository.updatePingConference(ID)).thenReturn(INDEX);
assertEquals(ping, conferenceService.ping(conferenceDto));
}
}