Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 7231cde9

Přidáno uživatelem Lukas Cerny před téměř 6 roky(ů)

Fixed ApiManager for adding a new vacation

Zobrazit rozdíly:

server/src/main/java/cz/zcu/yamanager/business/ApiManager.java
6 6
import cz.zcu.yamanager.repository.UserRepository;
7 7
import cz.zcu.yamanager.repository.VacationRepository;
8 8
import cz.zcu.yamanager.ws.rest.RESTFullException;
9
import org.apache.tomcat.jni.Local;
10 9
import org.slf4j.Logger;
11 10
import org.slf4j.LoggerFactory;
12 11
import org.springframework.beans.factory.annotation.Autowired;
13
import org.springframework.jdbc.core.JdbcTemplate;
14 12
import org.springframework.stereotype.Component;
15 13

  
16
import java.time.Duration;
17 14
import java.time.LocalDate;
18
import java.time.temporal.TemporalUnit;
19
import java.util.Collections;
20 15
import java.util.List;
21 16

  
22
import static java.time.temporal.ChronoUnit.MINUTES;
23

  
24 17
@Component
25 18
public class ApiManager implements Manager {
26 19

  
......
119 112

  
120 113
    @Override
121 114
    public void createVacation(Long userId, VacationDay vacationDay) throws RESTFullException {
122
        cz.zcu.yamanager.domain.VacationDay vacation = new cz.zcu.yamanager.domain.VacationDay(vacationDay.getDate(), vacationDay.getFrom(), vacationDay.getTo(), vacationDay.getStatus(), vacationDay.getType());
123 115

  
124 116
        User user = this.userRepository.getUser(userId);
125
        vacation.setStatus(user.getRole() == UserRole.EMPLOYER ? Status.ACCEPTED : Status.PENDING);
117
        vacationDay.setStatus(user.getRole() == UserRole.EMPLOYER ? Status.ACCEPTED : Status.PENDING);
118

  
119
        cz.zcu.yamanager.domain.VacationDay vacation = new cz.zcu.yamanager.domain.VacationDay(
120
                vacationDay.getDate(), vacationDay.getFrom(), vacationDay.getTo(), vacationDay.getStatus(), vacationDay.getType());
126 121

  
127 122
        if(vacation.getType() == VacationType.VACATION) {
128 123
            user.takeVacation(vacation.getFrom(), vacation.getTo());

Také k dispozici: Unified diff