From abea3c7dad3a44e94fb09821c223f45bde7a23ae Mon Sep 17 00:00:00 2001 From: "Artem.Arefev" Date: Sun, 2 Jun 2019 21:53:51 +0400 Subject: [PATCH] #112 ping model changed --- .../ru/ulstu/conference/model/Conference.java | 17 +-- .../conference/service/ConferenceService.java | 5 +- .../ru/ulstu/core/model/UserActivity.java | 4 - src/main/java/ru/ulstu/grant/model/Grant.java | 17 +-- .../ru/ulstu/grant/service/GrantService.java | 5 +- src/main/java/ru/ulstu/paper/model/Paper.java | 17 +-- .../ru/ulstu/paper/service/PaperService.java | 5 +- src/main/java/ru/ulstu/ping/model/Ping.java | 105 +++++------------- .../ulstu/ping/repository/PingRepository.java | 6 +- .../ru/ulstu/ping/service/PingService.java | 4 +- .../java/ru/ulstu/project/model/Project.java | 27 ++--- .../ulstu/project/service/ProjectService.java | 6 +- .../user/controller/UserMvcController.java | 8 +- .../ru/ulstu/user/service/UserService.java | 31 +----- src/main/resources/application.properties | 4 +- .../db/changelog-20190531_000000-schema.xml | 11 +- .../resources/templates/papers/paper.html | 1 + .../service/ConferenceServiceTest.java | 10 -- 18 files changed, 63 insertions(+), 220 deletions(-) diff --git a/src/main/java/ru/ulstu/conference/model/Conference.java b/src/main/java/ru/ulstu/conference/model/Conference.java index 09220c0..81a8de7 100644 --- a/src/main/java/ru/ulstu/conference/model/Conference.java +++ b/src/main/java/ru/ulstu/conference/model/Conference.java @@ -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 users = new ArrayList<>(); - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "conference_id") - @Fetch(FetchMode.SUBSELECT) - private List pings; - public String getTitle() { return title; } @@ -162,13 +158,4 @@ public class Conference extends BaseEntity implements UserActivity { public Set getActivityUsers() { return getUsers().stream().map(ConferenceUser::getUser).collect(Collectors.toSet()); } - - public void addPing(Ping ping) { - this.pings.add(ping); - } - - @Override - public List getPings() { - return this.pings; - } } diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java index 1b8e67b..ad5192f 100644 --- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java +++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java @@ -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) { diff --git a/src/main/java/ru/ulstu/core/model/UserActivity.java b/src/main/java/ru/ulstu/core/model/UserActivity.java index 051a5c9..8e4e270 100644 --- a/src/main/java/ru/ulstu/core/model/UserActivity.java +++ b/src/main/java/ru/ulstu/core/model/UserActivity.java @@ -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 getActivityUsers(); - void addPing(Ping ping); - List getPings(); } diff --git a/src/main/java/ru/ulstu/grant/model/Grant.java b/src/main/java/ru/ulstu/grant/model/Grant.java index c10ad11..ad74c1b 100644 --- a/src/main/java/ru/ulstu/grant/model/Grant.java +++ b/src/main/java/ru/ulstu/grant/model/Grant.java @@ -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 events = new ArrayList<>(); - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "grant_id") - @Fetch(FetchMode.SUBSELECT) - private List 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 getPings() { - return this.pings; - } } diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java index 84e363f..1770334 100644 --- a/src/main/java/ru/ulstu/grant/service/GrantService.java +++ b/src/main/java/ru/ulstu/grant/service/GrantService.java @@ -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)); } } diff --git a/src/main/java/ru/ulstu/paper/model/Paper.java b/src/main/java/ru/ulstu/paper/model/Paper.java index e183877..bfc2b5b 100644 --- a/src/main/java/ru/ulstu/paper/model/Paper.java +++ b/src/main/java/ru/ulstu/paper/model/Paper.java @@ -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 references = new ArrayList<>(); - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "paper_id") - @Fetch(FetchMode.SUBSELECT) - private List 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 getPings() { - return this.pings; - } } diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java index 0e159d5..3be9aee 100644 --- a/src/main/java/ru/ulstu/paper/service/PaperService.java +++ b/src/main/java/ru/ulstu/paper/service/PaperService.java @@ -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)); } } diff --git a/src/main/java/ru/ulstu/ping/model/Ping.java b/src/main/java/ru/ulstu/ping/model/Ping.java index 82c9fe2..7118c22 100644 --- a/src/main/java/ru/ulstu/ping/model/Ping.java +++ b/src/main/java/ru/ulstu/ping/model/Ping.java @@ -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 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; } } diff --git a/src/main/java/ru/ulstu/ping/repository/PingRepository.java b/src/main/java/ru/ulstu/ping/repository/PingRepository.java index 116c4fc..cec24e7 100644 --- a/src/main/java/ru/ulstu/ping/repository/PingRepository.java +++ b/src/main/java/ru/ulstu/ping/repository/PingRepository.java @@ -11,12 +11,10 @@ import java.util.List; public interface PingRepository extends JpaRepository { - @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 getPings(@Param("activity") String activity); @Query("SELECT p FROM Ping p WHERE (:dateFrom < date)") diff --git a/src/main/java/ru/ulstu/ping/service/PingService.java b/src/main/java/ru/ulstu/ping/service/PingService.java index 97cc353..e1c0035 100644 --- a/src/main/java/ru/ulstu/ping/service/PingService.java +++ b/src/main/java/ru/ulstu/ping/service/PingService.java @@ -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 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); diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java index 84324dd..54e8545 100644 --- a/src/main/java/ru/ulstu/project/model/Project.java +++ b/src/main/java/ru/ulstu/project/model/Project.java @@ -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 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 executors = new ArrayList<>(); - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "project_id") - @Fetch(FetchMode.SUBSELECT) - private List pings = new ArrayList<>(); +// @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) +// @JoinColumn(name = "project_id") +// @Fetch(FetchMode.SUBSELECT) +// private List pings = new ArrayList<>(); public String getTitle() { return title; @@ -149,15 +144,11 @@ public class Project extends BaseEntity implements UserActivity { } public Set getUsers() { - return new HashSet(getExecutors()); - } - - public void addPing(Ping ping) { - this.pings.add(new Ping()); + return new HashSet<>(getExecutors()); } @Override - public List getPings() { - return this.pings; + public Set getActivityUsers() { + return new HashSet<>(); } } diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java index 9e1e285..6c00193 100644 --- a/src/main/java/ru/ulstu/project/service/ProjectService.java +++ b/src/main/java/ru/ulstu/project/service/ProjectService.java @@ -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)); } } diff --git a/src/main/java/ru/ulstu/user/controller/UserMvcController.java b/src/main/java/ru/ulstu/user/controller/UserMvcController.java index 7069c10..df2ed71 100644 --- a/src/main/java/ru/ulstu/user/controller/UserMvcController.java +++ b/src/main/java/ru/ulstu/user/controller/UserMvcController.java @@ -65,10 +65,10 @@ public class UserMvcController extends OdinController { @ModelAttribute("allActivities") public Map getAllActivites() { - return ImmutableMap.of("papers", "Статьи", - "grants", "Гранты", - "projects", "Проекты", - "conferences", "Конференции"); + return ImmutableMap.of("PAPER", "Статьи", + "GRANT", "Гранты", + "PROJECT", "Проекты", + "CONFERENCE", "Конференции"); } @GetMapping("/pings") diff --git a/src/main/java/ru/ulstu/user/service/UserService.java b/src/main/java/ru/ulstu/user/service/UserService.java index e8cdd4e..b4f8f28 100644 --- a/src/main/java/ru/ulstu/user/service/UserService.java +++ b/src/main/java/ru/ulstu/user/service/UserService.java @@ -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 activitiesPings = new HashMap<>(); - List 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; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7e793c0..f4be778 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -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 \ No newline at end of file diff --git a/src/main/resources/db/changelog-20190531_000000-schema.xml b/src/main/resources/db/changelog-20190531_000000-schema.xml index 51fffe6..c035b35 100644 --- a/src/main/resources/db/changelog-20190531_000000-schema.xml +++ b/src/main/resources/db/changelog-20190531_000000-schema.xml @@ -4,15 +4,8 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> - - - + + - - - diff --git a/src/main/resources/templates/papers/paper.html b/src/main/resources/templates/papers/paper.html index 5c26d0f..e92e4c6 100644 --- a/src/main/resources/templates/papers/paper.html +++ b/src/main/resources/templates/papers/paper.html @@ -562,6 +562,7 @@ $(this).autocomplete("search"); }); + /*]]>*/ diff --git a/src/test/java/ru/ulstu/conference/service/ConferenceServiceTest.java b/src/test/java/ru/ulstu/conference/service/ConferenceServiceTest.java index 95f4820..686211e 100644 --- a/src/test/java/ru/ulstu/conference/service/ConferenceServiceTest.java +++ b/src/test/java/ru/ulstu/conference/service/ConferenceServiceTest.java @@ -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)); - } } \ No newline at end of file