Ignore:
Timestamp:
02/08/23 14:41:27 (22 months ago)
Author:
milamihajlovska <mila.mihajlovska01@…>
Branches:
master
Children:
2c7a732
Parents:
39a45e6 (diff), 90317ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://github.com/DenicaKj/MovieZone

Location:
src/main/java/com/example/moviezone/service/Impl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/main/java/com/example/moviezone/service/Impl/EventServiceImpl.java

    r39a45e6 r632e3d8  
    77
    88import java.time.LocalDate;
     9import java.util.Collections;
    910import java.util.List;
     11import java.util.Optional;
    1012
    1113@Service
     
    2628        return eventRepository.save(new Event(theme,duration,repeating,start_date,img_url));
    2729    }
     30
     31    @Override
     32    public List<Event> getEventsNow() {
     33        return eventRepository.getFilmsFromCinemaNow();
     34    }
     35
     36    @Override
     37    public List<Event> getEventsFromCinema(int id) {
     38        return eventRepository.getFilmsFromCinema(id);
     39    }
     40
     41    @Override
     42    public Optional<Event> getEventById(Long id) {
     43        return eventRepository.findAllById(Collections.singleton(id.intValue())).stream().findFirst();
     44    }
    2845}
  • src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java

    r39a45e6 r632e3d8  
    4040    }
    4141
     42    @Override
     43    public List<Film> getFilmsFromCinemaNow(int id) {
     44        return filmRepository.getFilmsFromCinemaNow(id);
     45    }
     46
     47    @Override
     48    public List<Film> getFilmsNow() {
     49        return filmRepository.getFilmsNow();
     50    }
     51
    4252}
Note: See TracChangeset for help on using the changeset viewer.