mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-27 22:37:15 +00:00
Adjusted server side code to deliver new EventDTO structure
This commit is contained in:
1 parent
c15f2b6d1f
commit
c3a75707c1
3 files changed
+5
-18
No files matched your search
+1
-1
@@ -85,7 +85,7 @@ public class HomeServiceImpl extends ProxiedRemoteServiceServlet implements Home
|
||||
|
||||
StageEventType stageType = pair.getA();
|
||||
EventHolder holder = pair.getB();
|
||||
result.addStageEvent(HomeServiceUtil.convertToEventStageDTO(holder.event, holder.baseURL, holder.onRemoteServer, stageType, getService(), false));
|
||||
result.addStageEvent(HomeServiceUtil.convertToEventStageDTO(holder.event, holder.baseURL, holder.onRemoteServer, stageType, getService()));
|
||||
|
||||
EventReferenceDTO eventRef = new EventReferenceDTO(holder.event);
|
||||
|
||||
|
||||
+3
-3
@@ -9,9 +9,9 @@ import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Random;
|
||||
import java.util.UUID;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
@@ -346,13 +346,13 @@ public final class HomeServiceUtil {
|
||||
return LocaleMatch.NO_MATCH;
|
||||
}
|
||||
|
||||
public static EventStageDTO convertToEventStageDTO(EventBase event, URL baseURL, boolean onRemoteServer, StageEventType stageType, RacingEventService service, boolean useTeaserImage) {
|
||||
public static EventStageDTO convertToEventStageDTO(EventBase event, URL baseURL, boolean onRemoteServer, StageEventType stageType, RacingEventService service) {
|
||||
EventStageDTO dto = new EventStageDTO();
|
||||
mapToMetadataDTO(event, dto, service);
|
||||
dto.setBaseURL(baseURL.toString());
|
||||
dto.setOnRemoteServer(onRemoteServer);
|
||||
dto.setStageType(stageType);
|
||||
dto.setStageImageURL(useTeaserImage ? findEventThumbnailImageUrlAsString(event) : getStageImageURLAsString(event));
|
||||
dto.setStageImageURL(getStageImageURLAsString(event));
|
||||
return dto;
|
||||
}
|
||||
|
||||
|
||||
+1
-14
@@ -16,33 +16,20 @@ import com.sap.sse.common.Util.Pair;
|
||||
|
||||
public class GetStagedEventsAction implements Action<ListResult<EventStageDTO>> {
|
||||
|
||||
private boolean useTeaserImage;
|
||||
|
||||
protected GetStagedEventsAction() {
|
||||
}
|
||||
|
||||
public GetStagedEventsAction(boolean useTeaserImage) {
|
||||
this.useTeaserImage = useTeaserImage;
|
||||
}
|
||||
|
||||
@GwtIncompatible
|
||||
public ListResult<EventStageDTO> execute(final DispatchContext context) throws MalformedURLException {
|
||||
EventStageCandidateCalculator stageCandidateCalculator = new EventStageCandidateCalculator();
|
||||
|
||||
HomeServiceUtil.forAllPublicEvents(context.getRacingEventService(), context.getRequest(), stageCandidateCalculator);
|
||||
|
||||
ListResult<EventStageDTO> result = new ListResult<>();
|
||||
|
||||
int count = 0;
|
||||
for(Pair<StageEventType, EventHolder> pair : stageCandidateCalculator.getFeaturedEvents()) {
|
||||
count++;
|
||||
if(count > HomeServiceImpl.MAX_STAGE_EVENTS) {
|
||||
break;
|
||||
}
|
||||
|
||||
StageEventType stageType = pair.getA();
|
||||
EventHolder holder = pair.getB();
|
||||
result.addValue(HomeServiceUtil.convertToEventStageDTO(holder.event, holder.baseURL, holder.onRemoteServer, stageType, context.getRacingEventService(), useTeaserImage));
|
||||
result.addValue(HomeServiceUtil.convertToEventStageDTO(holder.event, holder.baseURL, holder.onRemoteServer, stageType, context.getRacingEventService()));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user