diff --git a/pom.xml b/pom.xml
index 1b05a22..0063dd2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,10 @@
test
+
+ commons-collections
+ commons-collections
+
com.ioextendedgr.web.Application
diff --git a/src/main/java/com/ioextendedgr/web/builder/PresenterBuilder.java b/src/main/java/com/ioextendedgr/web/builder/PresenterBuilder.java
index 6ddf8f3..64c13de 100644
--- a/src/main/java/com/ioextendedgr/web/builder/PresenterBuilder.java
+++ b/src/main/java/com/ioextendedgr/web/builder/PresenterBuilder.java
@@ -4,33 +4,68 @@
import java.util.Collection;
import java.util.List;
-import com.ioextendedgr.web.data.Company;
+import org.apache.commons.collections.CollectionUtils;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
import com.ioextendedgr.web.data.Presenter;
-import com.ioextendedgr.web.viewDto.CompanyView;
+import com.ioextendedgr.web.data.User;
import com.ioextendedgr.web.viewDto.PresenterView;
public class PresenterBuilder {
- public static Collection build(Collection dtos) {
+ public static Collection build(Collection dtos,
+ Collection userDtos) {
List presenters = new ArrayList();
-
+
for (Presenter currPresenter : dtos) {
- presenters.add(build(currPresenter));
+ User user = findUserById(currPresenter.getId(), userDtos);
+ presenters.add(build(currPresenter, user));
}
-
+
return presenters;
}
-
- public static PresenterView build(Presenter dto) {
+
+ public static PresenterView build(Presenter dto, User userDto) {
PresenterView presenter = new PresenterView();
-
+
presenter.setCompanyView(CompanyBuilder.build(dto.getCompany()));
presenter.setId(dto.getId());
presenter.setJobTitle(dto.getJobTitle());
presenter.setShortBio(dto.getShortBio());
presenter.setUserId(dto.getUserId());
-
+
+ if (userDto != null) {
+ presenter.setFirstName(userDto.getFirstName());
+ presenter.setLastName(userDto.getLastName());
+ presenter.setEmail(userDto.getEmailAddress());
+ }
+
return presenter;
}
+ private static User findUserById(final Integer id,
+ Collection userDatas) {
+
+ if (id == null) {
+ return null;
+ }
+
+ Collection items = Collections2.filter(userDatas,
+ new Predicate() {
+
+ @Override
+ public boolean apply(User input) {
+ return id.equals(input.getId());
+ }
+ });
+
+ if (CollectionUtils.isEmpty(items)) {
+ return null;
+ }
+
+ return items.iterator().next();
+
+ }
+
}
diff --git a/src/main/java/com/ioextendedgr/web/data/ConferenceSession.java b/src/main/java/com/ioextendedgr/web/data/ConferenceSession.java
index 4b3dba2..e247deb 100644
--- a/src/main/java/com/ioextendedgr/web/data/ConferenceSession.java
+++ b/src/main/java/com/ioextendedgr/web/data/ConferenceSession.java
@@ -173,22 +173,6 @@ public void setConferenceSessionPresenters(
this.conferenceSessionPresenters = conferenceSessionPresenters;
}
- public ConferenceSessionPresenter addConferenceSessionPresenter(
- ConferenceSessionPresenter conferenceSessionPresenter) {
- getConferenceSessionPresenters().add(conferenceSessionPresenter);
- conferenceSessionPresenter.setConferenceSession(this);
-
- return conferenceSessionPresenter;
- }
-
- public ConferenceSessionPresenter removeConferenceSessionPresenter(
- ConferenceSessionPresenter conferenceSessionPresenter) {
- getConferenceSessionPresenters().remove(conferenceSessionPresenter);
- conferenceSessionPresenter.setConferenceSession(null);
-
- return conferenceSessionPresenter;
- }
-
public List getConferenceSessionRegistrations() {
return this.conferenceSessionRegistrations;
}
diff --git a/src/main/java/com/ioextendedgr/web/data/ConferenceSessionPresenter.java b/src/main/java/com/ioextendedgr/web/data/ConferenceSessionPresenter.java
index 7bea82f..f76f1fd 100644
--- a/src/main/java/com/ioextendedgr/web/data/ConferenceSessionPresenter.java
+++ b/src/main/java/com/ioextendedgr/web/data/ConferenceSessionPresenter.java
@@ -1,7 +1,6 @@
package com.ioextendedgr.web.data;
import java.io.Serializable;
-import java.util.List;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -9,7 +8,6 @@
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
import javax.persistence.Table;
/**
@@ -25,10 +23,6 @@ public class ConferenceSessionPresenter implements Serializable {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
- // bi-directional many-to-one association to ConferenceSession
- @OneToMany(mappedBy = "conferenceSessionPresenter")
- private List conferenceSessions;
-
// bi-directional many-to-one association to ConferenceSession
@ManyToOne
@JoinColumn(name = "conference_session_id")
@@ -49,14 +43,6 @@ public void setId(Integer id) {
this.id = id;
}
- public List getConferenceSessions() {
- return this.conferenceSessions;
- }
-
- public void setConferenceSessions(List conferenceSessions) {
- this.conferenceSessions = conferenceSessions;
- }
-
public ConferenceSession getConferenceSession() {
return this.conferenceSession;
}
diff --git a/src/main/java/com/ioextendedgr/web/repository/UserRepository.java b/src/main/java/com/ioextendedgr/web/repository/UserRepository.java
new file mode 100644
index 0000000..f34dc90
--- /dev/null
+++ b/src/main/java/com/ioextendedgr/web/repository/UserRepository.java
@@ -0,0 +1,9 @@
+package com.ioextendedgr.web.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.ioextendedgr.web.data.User;
+
+public interface UserRepository extends JpaRepository {
+
+}
diff --git a/src/main/java/com/ioextendedgr/web/service/ConferenceService.java b/src/main/java/com/ioextendedgr/web/service/ConferenceService.java
index 497657d..e240003 100644
--- a/src/main/java/com/ioextendedgr/web/service/ConferenceService.java
+++ b/src/main/java/com/ioextendedgr/web/service/ConferenceService.java
@@ -1,21 +1,45 @@
package com.ioextendedgr.web.service;
-import com.google.common.base.Strings;
-import com.ioextendedgr.web.builder.*;
-import com.ioextendedgr.web.data.*;
-import com.ioextendedgr.web.repository.*;
-import com.ioextendedgr.web.util.StubFactory;
-import com.ioextendedgr.web.viewDto.*;
+import java.util.Collection;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import com.google.common.base.Strings;
+import com.ioextendedgr.web.builder.CompanyBuilder;
+import com.ioextendedgr.web.builder.ConferenceSessionBuilder;
+import com.ioextendedgr.web.builder.ConferenceViewBuilder;
+import com.ioextendedgr.web.builder.LocationBuilder;
+import com.ioextendedgr.web.builder.PresenterBuilder;
+import com.ioextendedgr.web.builder.RoomViewBuilder;
+import com.ioextendedgr.web.builder.SponsorBuilder;
+import com.ioextendedgr.web.builder.SponsorLevelBuilder;
+import com.ioextendedgr.web.data.Company;
+import com.ioextendedgr.web.data.Conference;
import com.ioextendedgr.web.data.ConferenceSession;
+import com.ioextendedgr.web.data.Presenter;
+import com.ioextendedgr.web.data.Room;
+import com.ioextendedgr.web.data.Sponsor;
+import com.ioextendedgr.web.data.SponsorLevel;
+import com.ioextendedgr.web.data.User;
+import com.ioextendedgr.web.repository.CompanyRepository;
import com.ioextendedgr.web.repository.ConferenceRepository;
import com.ioextendedgr.web.repository.ConferenceSessionRepository;
import com.ioextendedgr.web.repository.LocationRepository;
import com.ioextendedgr.web.repository.PresenterRepository;
import com.ioextendedgr.web.repository.RoomRepository;
-import java.util.Collection;
+import com.ioextendedgr.web.repository.SponsorLevelRepository;
+import com.ioextendedgr.web.repository.SponsorRepository;
+import com.ioextendedgr.web.repository.UserRepository;
+import com.ioextendedgr.web.util.StubFactory;
+import com.ioextendedgr.web.viewDto.CompanyView;
+import com.ioextendedgr.web.viewDto.ConferenceSessionView;
+import com.ioextendedgr.web.viewDto.ConferenceView;
+import com.ioextendedgr.web.viewDto.LocationView;
+import com.ioextendedgr.web.viewDto.PresenterView;
+import com.ioextendedgr.web.viewDto.RoomView;
+import com.ioextendedgr.web.viewDto.SponsorLevelView;
+import com.ioextendedgr.web.viewDto.SponsorView;
@Component
public class ConferenceService {
@@ -26,60 +50,64 @@ public class ConferenceService {
@Autowired
private ConferenceRepository conferenceRepository;
- @Autowired
- private LocationRepository locationRepository;
+ @Autowired
+ private LocationRepository locationRepository;
- @Autowired
- private ConferenceSessionRepository conferenceSessionRepository;
+ @Autowired
+ private ConferenceSessionRepository conferenceSessionRepository;
@Autowired
private RoomRepository roomRepository;
- @Autowired
- private PresenterRepository presenterRepository;
-
- @Autowired
- private CompanyRepository companyRepository;
-
- @Autowired
- private SponsorRepository sponsorRepository;
-
- @Autowired
- private SponsorLevelRepository sponsorLevelRepository;
-
- public Collection findAllCompanies(){
- return CompanyBuilder.build(companyRepository.findAll());
- }
-
- public CompanyView findCompanyById(Integer id){
- return CompanyBuilder.build(companyRepository.findOne(id));
- }
-
- public void deleteCompany(Integer id){
- companyRepository.delete(id);
- }
-
- public void updateCompany(Company inputCompany){
- Company managedCompany = companyRepository.findOne(inputCompany.getId());
-
- if(!Strings.isNullOrEmpty(inputCompany.getName())){
- managedCompany.setName(inputCompany.getName());
- }
- if(!Strings.isNullOrEmpty(inputCompany.getShortDesc())){
- managedCompany.setShortDesc(inputCompany.getShortDesc());
- }
- if(!Strings.isNullOrEmpty(inputCompany.getFullDesc())){
- managedCompany.setFullDesc(inputCompany.getFullDesc());
- }
- if(!Strings.isNullOrEmpty(inputCompany.getLogoPath())){
- managedCompany.setLogoPath(inputCompany.getLogoPath());
- }
- companyRepository.save(managedCompany);
- }
-
- public void addCompany(Company company){
- companyRepository.save(company);
- }
+ @Autowired
+ private PresenterRepository presenterRepository;
+
+ @Autowired
+ private CompanyRepository companyRepository;
+
+ @Autowired
+ private SponsorRepository sponsorRepository;
+
+ @Autowired
+ private UserRepository userRepository;
+
+ @Autowired
+ private SponsorLevelRepository sponsorLevelRepository;
+
+ public Collection findAllCompanies() {
+ return CompanyBuilder.build(companyRepository.findAll());
+ }
+
+ public CompanyView findCompanyById(Integer id) {
+ return CompanyBuilder.build(companyRepository.findOne(id));
+ }
+
+ public void deleteCompany(Integer id) {
+ companyRepository.delete(id);
+ }
+
+ public void updateCompany(Company inputCompany) {
+ Company managedCompany = companyRepository
+ .findOne(inputCompany.getId());
+
+ if (!Strings.isNullOrEmpty(inputCompany.getName())) {
+ managedCompany.setName(inputCompany.getName());
+ }
+ if (!Strings.isNullOrEmpty(inputCompany.getShortDesc())) {
+ managedCompany.setShortDesc(inputCompany.getShortDesc());
+ }
+ if (!Strings.isNullOrEmpty(inputCompany.getFullDesc())) {
+ managedCompany.setFullDesc(inputCompany.getFullDesc());
+ }
+ if (!Strings.isNullOrEmpty(inputCompany.getLogoPath())) {
+ managedCompany.setLogoPath(inputCompany.getLogoPath());
+ }
+ companyRepository.save(managedCompany);
+ }
+
+ public void addCompany(Company company) {
+ companyRepository.save(company);
+ }
public Collection findAllConferences() {
return ConferenceViewBuilder.build(conferenceRepository.findAll());
@@ -90,88 +118,109 @@ public ConferenceView findConferenceById(Integer id) {
}
public Collection findAllPresenters() {
- return PresenterBuilder.build(presenterRepository.findAll());
+ return PresenterBuilder.build(presenterRepository.findAll(),
+ userRepository.findAll());
}
public PresenterView findPresenterById(Integer id) {
- return PresenterBuilder.build(presenterRepository.findOne(id));
- }
-
- public void deletePresenter(Integer id){
- presenterRepository.delete(id);
- }
-
- public void addPresenter(Presenter presenter){
- presenterRepository.save(presenter);
- }
-
- public void updatePresenter(Presenter inputPresenter){
- Presenter managedPresenter = presenterRepository.findOne(inputPresenter.getId());
- if(inputPresenter.getCompany() != null && inputPresenter.getCompany().getId() != null){
- managedPresenter.setCompany(inputPresenter.getCompany());
- }
- if(inputPresenter.getUserId() != null){
- managedPresenter.setUserId(inputPresenter.getUserId());
- }
- if(!Strings.isNullOrEmpty(inputPresenter.getJobTitle())){
- managedPresenter.setJobTitle(inputPresenter.getJobTitle());
- }
- if(!Strings.isNullOrEmpty(inputPresenter.getShortBio())){
- managedPresenter.setShortBio(inputPresenter.getShortBio());
- }
- presenterRepository.save(managedPresenter);
- }
-
- public Collection findAllConferenceSessions() {
- return ConferenceSessionBuilder.build(conferenceSessionRepository
- .findAll());
- }
-
- public void addConferenceSession(ConferenceSession conferenceSession){
- conferenceSessionRepository.save(conferenceSession);
- }
-
- public void updateConferenceSession(ConferenceSession inputConferenceSession){
- ConferenceSession managedConferenceSession = conferenceSessionRepository.findOne(inputConferenceSession.getId());
+ Presenter presenter = presenterRepository.findOne(id);
- if(!Strings.isNullOrEmpty(inputConferenceSession.getName())){
- managedConferenceSession.setName(inputConferenceSession.getName());
- }
+ if (presenter == null) {
+ return null;
+ }
- if(!Strings.isNullOrEmpty(inputConferenceSession.getShortDesc())){
- managedConferenceSession.setShortDesc(inputConferenceSession.getShortDesc());
- }
+ User user = null;
+ if (presenter.getUserId() != null) {
+ user = userRepository.findOne(presenter.getUserId());
+ }
+ return PresenterBuilder.build(presenter, user);
+ }
- if(!Strings.isNullOrEmpty(inputConferenceSession.getFullDesc())){
- managedConferenceSession.setFullDesc(inputConferenceSession.getFullDesc());
- }
+ public void deletePresenter(Integer id) {
+ presenterRepository.delete(id);
+ }
- if(inputConferenceSession.getDuration() != null){
- managedConferenceSession.setDuration(inputConferenceSession.getDuration());
- }
+ public void addPresenter(Presenter presenter) {
+ presenterRepository.save(presenter);
+ }
- if(inputConferenceSession.getStartDttm() != null){
- managedConferenceSession.setStartDttm(inputConferenceSession.getStartDttm());
- }
+ public void updatePresenter(Presenter inputPresenter) {
+ Presenter managedPresenter = presenterRepository.findOne(inputPresenter
+ .getId());
+ if (inputPresenter.getCompany() != null
+ && inputPresenter.getCompany().getId() != null) {
+ managedPresenter.setCompany(inputPresenter.getCompany());
+ }
+ if (inputPresenter.getUserId() != null) {
+ managedPresenter.setUserId(inputPresenter.getUserId());
+ }
+ if (!Strings.isNullOrEmpty(inputPresenter.getJobTitle())) {
+ managedPresenter.setJobTitle(inputPresenter.getJobTitle());
+ }
+ if (!Strings.isNullOrEmpty(inputPresenter.getShortBio())) {
+ managedPresenter.setShortBio(inputPresenter.getShortBio());
+ }
+ presenterRepository.save(managedPresenter);
+ }
- if(inputConferenceSession.getConference() != null && inputConferenceSession.getConference().getId() != null){
- managedConferenceSession.setConference(inputConferenceSession.getConference());
- }
+ public Collection findAllConferenceSessions() {
+ return ConferenceSessionBuilder.build(conferenceSessionRepository
+ .findAll());
+ }
- if(inputConferenceSession.getRoom() != null && inputConferenceSession.getRoom().getId() != null){
- managedConferenceSession.setRoom(inputConferenceSession.getRoom());
- }
+ public void addConferenceSession(ConferenceSession conferenceSession) {
+ conferenceSessionRepository.save(conferenceSession);
+ }
- conferenceSessionRepository.save(managedConferenceSession);
- }
+ public void updateConferenceSession(ConferenceSession inputConferenceSession) {
+ ConferenceSession managedConferenceSession = conferenceSessionRepository
+ .findOne(inputConferenceSession.getId());
+
+ if (!Strings.isNullOrEmpty(inputConferenceSession.getName())) {
+ managedConferenceSession.setName(inputConferenceSession.getName());
+ }
+
+ if (!Strings.isNullOrEmpty(inputConferenceSession.getShortDesc())) {
+ managedConferenceSession.setShortDesc(inputConferenceSession
+ .getShortDesc());
+ }
+
+ if (!Strings.isNullOrEmpty(inputConferenceSession.getFullDesc())) {
+ managedConferenceSession.setFullDesc(inputConferenceSession
+ .getFullDesc());
+ }
+
+ if (inputConferenceSession.getDuration() != null) {
+ managedConferenceSession.setDuration(inputConferenceSession
+ .getDuration());
+ }
+
+ if (inputConferenceSession.getStartDttm() != null) {
+ managedConferenceSession.setStartDttm(inputConferenceSession
+ .getStartDttm());
+ }
+
+ if (inputConferenceSession.getConference() != null
+ && inputConferenceSession.getConference().getId() != null) {
+ managedConferenceSession.setConference(inputConferenceSession
+ .getConference());
+ }
+
+ if (inputConferenceSession.getRoom() != null
+ && inputConferenceSession.getRoom().getId() != null) {
+ managedConferenceSession.setRoom(inputConferenceSession.getRoom());
+ }
+
+ conferenceSessionRepository.save(managedConferenceSession);
+ }
- public void deleteConferenceSession(Integer id){
- conferenceSessionRepository.delete(id);
- }
+ public void deleteConferenceSession(Integer id) {
+ conferenceSessionRepository.delete(id);
+ }
- public Collection findAllLocations() {
- return LocationBuilder.build(locationRepository.findAll());
- }
+ public Collection findAllLocations() {
+ return LocationBuilder.build(locationRepository.findAll());
+ }
public ConferenceSessionView findConferenceSessionById(Integer id) {
return ConferenceSessionBuilder.build(conferenceSessionRepository
@@ -184,113 +233,119 @@ public Collection findConferenceSessionsByConferenceId(
.findByConferenceId(id));
}
- public void addConference(Conference conference){
- conferenceRepository.save(conference);
- }
+ public void addConference(Conference conference) {
+ conferenceRepository.save(conference);
+ }
- public void deleteConference(Integer id){
- conferenceRepository.delete(id);
- }
+ public void deleteConference(Integer id) {
+ conferenceRepository.delete(id);
+ }
- public void updateConference(Conference inputConference){
- Conference managedConference =conferenceRepository.findOne(inputConference.getId());
- if(!Strings.isNullOrEmpty(inputConference.getName())){
- managedConference.setName(inputConference.getName());
- }
+ public void updateConference(Conference inputConference) {
+ Conference managedConference = conferenceRepository
+ .findOne(inputConference.getId());
+ if (!Strings.isNullOrEmpty(inputConference.getName())) {
+ managedConference.setName(inputConference.getName());
+ }
- if(!Strings.isNullOrEmpty(inputConference.getShortDesc())){
- managedConference.setShortDesc(inputConference.getShortDesc());
- }
+ if (!Strings.isNullOrEmpty(inputConference.getShortDesc())) {
+ managedConference.setShortDesc(inputConference.getShortDesc());
+ }
- if(!Strings.isNullOrEmpty(inputConference.getFullDesc())){
- managedConference.setFullDesc(inputConference.getFullDesc());
- }
+ if (!Strings.isNullOrEmpty(inputConference.getFullDesc())) {
+ managedConference.setFullDesc(inputConference.getFullDesc());
+ }
- if(inputConference.getStartDate() != null){
- managedConference.setStartDate(inputConference.getStartDate());
- }
+ if (inputConference.getStartDate() != null) {
+ managedConference.setStartDate(inputConference.getStartDate());
+ }
- if(inputConference.getEndDate() != null){
- managedConference.setEndDate(inputConference.getEndDate());
- }
+ if (inputConference.getEndDate() != null) {
+ managedConference.setEndDate(inputConference.getEndDate());
+ }
- if(inputConference.getLocation() != null && inputConference.getLocation().getId() != null){
- managedConference.setLocation(inputConference.getLocation());
- }
+ if (inputConference.getLocation() != null
+ && inputConference.getLocation().getId() != null) {
+ managedConference.setLocation(inputConference.getLocation());
+ }
- conferenceRepository.save(managedConference);
- }
+ conferenceRepository.save(managedConference);
+ }
- public Collection findAllRooms(){
- return RoomViewBuilder.build(roomRepository.findAll());
- }
+ public Collection findAllRooms() {
+ return RoomViewBuilder.build(roomRepository.findAll());
+ }
public RoomView findRoomById(Integer id) {
return RoomViewBuilder.build(roomRepository.findOne(id));
}
- public Collection findAllSponsors() {
- return SponsorBuilder.build(sponsorRepository.findAll());
- }
-
- public SponsorView findSponsorById(Integer id) {
- return SponsorBuilder.build(sponsorRepository.findOne(id));
- }
-
- public void deleteSponsor(Integer id){
- sponsorRepository.delete(id);
- }
-
- public void addSponsor(Sponsor sponsor){
- sponsorRepository.save(sponsor);
- }
-
- public void updateSponsor(Sponsor inputSponsor){
- Sponsor managedSponsor = sponsorRepository.findOne(inputSponsor.getId());
- if(!Strings.isNullOrEmpty(inputSponsor.getHomePageUrl())){
- managedSponsor.setHomePageUrl(inputSponsor.getHomePageUrl());
- }
- if(!Strings.isNullOrEmpty(inputSponsor.getLogoPath())){
- managedSponsor.setLogoPath(inputSponsor.getLogoPath());
- }
- if(!Strings.isNullOrEmpty(inputSponsor.getName())){
- managedSponsor.setName(inputSponsor.getName());
- }
- if(inputSponsor.getSponsorLevelBean() != null && inputSponsor.getSponsorLevelBean().getId() != null){
- SponsorLevel sponsorLevel = new SponsorLevel();
- sponsorLevel.setId(inputSponsor.getSponsorLevelBean().getId());
- managedSponsor.setSponsorLevelBean(sponsorLevel);
- }
- sponsorRepository.save(managedSponsor);
- }
-
- public Collection findAllSponsorLevels(){
- return SponsorLevelBuilder.build(sponsorLevelRepository.findAll());
- }
- public void addRoom(Room room){
- roomRepository.save(room);
- }
-
- public void deleteRoom(Integer id){
- roomRepository.delete(id);
- }
-
- public void updateRoom(Room inputRoom){
- Room managedRoom = roomRepository.findOne(inputRoom.getId());
-
- if(!Strings.isNullOrEmpty(inputRoom.getShortDesc())){
- managedRoom.setShortDesc(inputRoom.getShortDesc());
- }
- if(!Strings.isNullOrEmpty(inputRoom.getFullDesc())){
- managedRoom.setFullDesc(inputRoom.getFullDesc());
- }
- if(inputRoom.getConference() != null && inputRoom.getConference().getId() != null){
- Conference conference = new Conference();
- conference.setId(inputRoom.getConference().getId());
- managedRoom.setConference(conference);
- }
-
- roomRepository.save(managedRoom);
- }
-
+ public Collection findAllSponsors() {
+ return SponsorBuilder.build(sponsorRepository.findAll());
+ }
+
+ public SponsorView findSponsorById(Integer id) {
+ return SponsorBuilder.build(sponsorRepository.findOne(id));
+ }
+
+ public void deleteSponsor(Integer id) {
+ sponsorRepository.delete(id);
+ }
+
+ public void addSponsor(Sponsor sponsor) {
+ sponsorRepository.save(sponsor);
+ }
+
+ public void updateSponsor(Sponsor inputSponsor) {
+ Sponsor managedSponsor = sponsorRepository
+ .findOne(inputSponsor.getId());
+ if (!Strings.isNullOrEmpty(inputSponsor.getHomePageUrl())) {
+ managedSponsor.setHomePageUrl(inputSponsor.getHomePageUrl());
+ }
+ if (!Strings.isNullOrEmpty(inputSponsor.getLogoPath())) {
+ managedSponsor.setLogoPath(inputSponsor.getLogoPath());
+ }
+ if (!Strings.isNullOrEmpty(inputSponsor.getName())) {
+ managedSponsor.setName(inputSponsor.getName());
+ }
+ if (inputSponsor.getSponsorLevelBean() != null
+ && inputSponsor.getSponsorLevelBean().getId() != null) {
+ SponsorLevel sponsorLevel = new SponsorLevel();
+ sponsorLevel.setId(inputSponsor.getSponsorLevelBean().getId());
+ managedSponsor.setSponsorLevelBean(sponsorLevel);
+ }
+ sponsorRepository.save(managedSponsor);
+ }
+
+ public Collection findAllSponsorLevels() {
+ return SponsorLevelBuilder.build(sponsorLevelRepository.findAll());
+ }
+
+ public void addRoom(Room room) {
+ roomRepository.save(room);
+ }
+
+ public void deleteRoom(Integer id) {
+ roomRepository.delete(id);
+ }
+
+ public void updateRoom(Room inputRoom) {
+ Room managedRoom = roomRepository.findOne(inputRoom.getId());
+
+ if (!Strings.isNullOrEmpty(inputRoom.getShortDesc())) {
+ managedRoom.setShortDesc(inputRoom.getShortDesc());
+ }
+ if (!Strings.isNullOrEmpty(inputRoom.getFullDesc())) {
+ managedRoom.setFullDesc(inputRoom.getFullDesc());
+ }
+ if (inputRoom.getConference() != null
+ && inputRoom.getConference().getId() != null) {
+ Conference conference = new Conference();
+ conference.setId(inputRoom.getConference().getId());
+ managedRoom.setConference(conference);
+ }
+
+ roomRepository.save(managedRoom);
+ }
+
}
diff --git a/src/main/java/com/ioextendedgr/web/viewDto/PresenterView.java b/src/main/java/com/ioextendedgr/web/viewDto/PresenterView.java
index ee345a2..7093f50 100644
--- a/src/main/java/com/ioextendedgr/web/viewDto/PresenterView.java
+++ b/src/main/java/com/ioextendedgr/web/viewDto/PresenterView.java
@@ -4,39 +4,76 @@ public class PresenterView {
private Integer id;
private Integer userId;
+
+ private String firstName;
+ private String lastName;
+ private String email;
+
private String shortBio;
private String jobTitle;
private CompanyView companyView;
+
public Integer getId() {
return id;
}
+
public void setId(Integer id) {
this.id = id;
}
+
public Integer getUserId() {
return userId;
}
+
public void setUserId(Integer userId) {
this.userId = userId;
}
+
public String getShortBio() {
return shortBio;
}
+
public void setShortBio(String shortBio) {
this.shortBio = shortBio;
}
+
public String getJobTitle() {
return jobTitle;
}
+
public void setJobTitle(String jobTitle) {
this.jobTitle = jobTitle;
}
+
public CompanyView getCompanyView() {
return companyView;
}
+
public void setCompanyView(CompanyView companyView) {
this.companyView = companyView;
}
-
-
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
}