/*******************************************************************************
 * Copyright (c) 2016 Stichting Yona Foundation This Source Code Form is subject to the terms of the Mozilla Public License, v.
 * 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
 *******************************************************************************/
package nu.yona.server.analysis.service;

import java.time.ZonedDateTime;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.Callable;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;

import nu.yona.server.exceptions.YonaException;

public abstract class IntervalActivityDTO
{
	public enum LevelOfDetail
	{
		WeekOverview, WeekDetail, DayOverview, DayDetail
	}

	private UUID goalID;
	private ZonedDateTime startTime;

	private List<Integer> spread;
	private Optional<Integer> totalActivityDurationMinutes;

	protected IntervalActivityDTO(UUID goalID, ZonedDateTime startTime, List<Integer> spread,
			Optional<Integer> totalActivityDurationMinutes)
	{
		this.goalID = goalID;
		this.startTime = startTime;
		this.spread = spread;
		this.totalActivityDurationMinutes = totalActivityDurationMinutes;
	}

	@JsonIgnore
	public ZonedDateTime getStartTime()
	{
		return startTime;
	}

	/*
	 * The ISO-8601 week or day date.
	 */
	public abstract String getDate();

	/*
	 * The time zone in which the interval was recorded.
	 */
	public String getTimeZoneId()
	{
		return startTime.getZone().getId();
	}

	/*
	 * As the goal is already in the user profile, just a reference suffices. Notice that a goal may be removed; in that case it
	 * can be retrieved by the link.
	 */
	@JsonIgnore
	public UUID getGoalID()
	{
		return goalID;
	}

	@JsonInclude(Include.NON_EMPTY)
	public List<Integer> getSpread()
	{
		return spread;
	}

	@JsonInclude(Include.NON_NULL)
	public Integer getTotalActivityDurationMinutes()
	{
		return totalActivityDurationMinutes.orElse(null);
	}

	protected static <T> T includeIf(Callable<T> calculator, boolean condition)
	{
		if (condition)
		{
			try
			{
				return calculator.call();
			}
			catch (Exception e)
			{
				throw YonaException.unexpected(e);
			}
		}
		return null;
	}
}

@@ -2134,250 +2134,7 @@
 ;%0A%09%7D
-%0A%0A%09protected static %3CT%3E T includeIf(Callable%3CT%3E calculator, boolean condition)%0A%09%7B%0A%09%09if (condition)%0A%09%09%7B%0A%09%09%09try%0A%09%09%09%7B%0A%09%09%09%09return calculator.call();%0A%09%09%09%7D%0A%09%09%09catch (Exception e)%0A%09%09%09%7B%0A%09%09%09%09throw YonaException.unexpected(e);%0A%09%09%09%7D%0A%09%09%7D%0A%09%09return null;%0A%09%7D
 %0A%7D%0A

Update IntervalActivityDTO.java