@@ -131,7 +131,7 @@ public class ServieService
131
131
public Servie addServie (String type , Integer tmdbId )
132
132
{
133
133
Servie servie = new Servie ();
134
- if (type .equals ("tv" ))
134
+ if (type .equals (ServieType . SERIES . toString () ))
135
135
servie = addSeries (tmdbId );
136
136
else
137
137
servie = addMovie (tmdbId );
@@ -217,8 +217,7 @@ private void addMovieCollection(Integer collectionId)
217
217
log .info (" Adding movie {} as a part of collection" , movie .getTmdbId ());
218
218
ResponseEntity <Movie > movieResponse = restTemplate
219
219
.exchange (
220
- tmdbApiBaseUrl +"/" +ServieType .MOVIE .toString ()+"/"
221
- +movie .getTmdbId (),
220
+ tmdbApiBaseUrl +"/" +ServieType .MOVIE .toString ()+"/" +movie .getTmdbId (),
222
221
httpMethod , httpEntity , Movie .class );
223
222
if (movieResponse .getStatusCode ()==HttpStatus .OK )
224
223
{
@@ -305,18 +304,18 @@ private void addMovieCollection(Integer collectionId)
305
304
}
306
305
}
307
306
308
- @ Scheduled (fixedRate = Integer .MAX_VALUE )
307
+ // @Scheduled(fixedRate = Integer.MAX_VALUE)
309
308
// @Scheduled(cron = "0 0 6 * * ?") // Runs every morning at 6 AM
310
309
@ Transactional
311
310
public void updateAiringSeries ()
312
311
{
313
312
// Series (Airing) -> everyday once
314
- // List<Series> serieses = seriesRepository.findByLastModifiedBeforeAndStatus(LocalDateTime.now(ZoneOffset.UTC),
315
- // "Returning Series");
316
- // log.info("Updating {} series which are currently airing", serieses.size());
317
- // for(Series series : serieses)
318
- updateSeries (131041 /* series.getTmdbId()*/ );
319
- // log.info("Finished Updating {} series which are currently airing", serieses.size());
313
+ List <Series > serieses = seriesRepository .findByLastModifiedBeforeAndStatus (LocalDateTime .now (ZoneOffset .UTC ),
314
+ "Returning Series" );
315
+ log .info ("Updating {} series which are currently airing" , serieses .size ());
316
+ for (Series series : serieses )
317
+ updateSeries (series .getTmdbId ());
318
+ log .info ("Finished Updating {} series which are currently airing" , serieses .size ());
320
319
}
321
320
322
321
// @Scheduled(fixedRate = Integer.MAX_VALUE)
@@ -343,7 +342,7 @@ private void updateSeries(Integer tmdbId)
343
342
return ;
344
343
}
345
344
log .info ("Updating series {} name {}" , tmdbId , tempSeries .getTitle ());
346
- Series oldSeries = (Series ) servieRepository .findById (new ServieKey ("tv" , tmdbId )).get ();
345
+ Series oldSeries = (Series ) servieRepository .findById (new ServieKey (ServieType . SERIES . toString () , tmdbId )).get ();
347
346
if (!oldSeries .isAdult ()==tempSeries .isAdult ())
348
347
{
349
348
log .info (" Series 'Adult' mismatched" );
@@ -884,7 +883,7 @@ private Series fetchSeriesFromTmdb(Integer tmdbId)
884
883
allEpCrews = null ;
885
884
allSeasonCasts = null ;
886
885
series .setSeasons (seasons );
887
- series .setChildtype ("tv" );
886
+ series .setChildtype (ServieType . SERIES . toString () );
888
887
series .setGenres (genreUtils .convertTmdbGenresToTrackServieGenres (series .getGenres ()));
889
888
series .setLastModified (LocalDateTime .now (ZoneOffset .UTC ));
890
889
}
@@ -907,7 +906,7 @@ public ServieDto getServie(@NonNull Integer userId, String childtype, Integer tm
907
906
// user's database
908
907
ServieDto ServieDto = servieRepository .getServieForServiePage (user , childtype , tmdbId )
909
908
.orElseGet (() -> searchServie (childtype , tmdbId ));
910
- if (childtype .equals ("tv" ))
909
+ if (childtype .equals (ServieType . SERIES . toString () ))
911
910
{
912
911
List <SeasonDto > seasons = userSeasonDataRepository .getSeasons (user , childtype , tmdbId ).stream ()
913
912
.sorted (Comparator .comparing (SeasonDto ::getSeasonNo ))
@@ -943,21 +942,19 @@ public ServieDto getServie(@NonNull Integer userId, String childtype, Integer tm
943
942
private ServieDto searchServie (String childtype , Integer tmdbId )
944
943
{
945
944
Servie servie = addServie (childtype , tmdbId );
946
- if (childtype .equals ("tv" ))
945
+ if (childtype .equals (ServieType . SERIES . toString () ))
947
946
{
948
947
Series series = (Series ) servie ;
949
- ServieDto ser = new ServieDto (tmdbId , childtype , servie .getTitle (), servie .getStatus (), servie .getTagline (),
948
+ return new ServieDto (tmdbId , childtype , servie .getTitle (), servie .getStatus (), servie .getTagline (),
950
949
servie .getOverview (), servie .getBackdropPath (), servie .getLogoPath (), servie .getLastModified (),
951
950
null , null , series .getTotalSeasons (), series .getTotalEpisodes (), 0 , 0 , 0 , false );
952
- return ser ;
953
951
}
954
952
else
955
953
{
956
954
Movie movie = (Movie ) servie ;
957
- ServieDto ser = new ServieDto (tmdbId , childtype , servie .getTitle (), servie .getStatus (), servie .getTagline (),
955
+ return new ServieDto (tmdbId , childtype , servie .getTitle (), servie .getStatus (), servie .getTagline (),
958
956
servie .getOverview (), servie .getBackdropPath (), servie .getLogoPath (), servie .getLastModified (),
959
957
movie .getReleaseDate (), movie .getRuntime (), null , null , 0 , 0 , 0 , false );
960
- return ser ;
961
958
}
962
959
}
963
960
@@ -1185,7 +1182,7 @@ public void toggleServieWatch(@NonNull Integer userId, String childtype, Integer
1185
1182
.orElseGet (() -> addServie (childtype , tmdbId ));
1186
1183
UserServieData userServieData = userServieDataRepository .findById (new UserServieDataKey (user , servie ))
1187
1184
.orElseGet (() -> userServieDataRepository .save (new UserServieData (user , servie )));
1188
- if (childtype .equals ("tv" ))
1185
+ if (childtype .equals (ServieType . SERIES . toString () ))
1189
1186
{
1190
1187
List <Integer > seasonNos = new ArrayList <>();
1191
1188
// if (Series 1 -> 0)
@@ -1250,7 +1247,7 @@ public void toggleSeasonWatch2(@NonNull Integer userId, Integer tmdbId, Integer
1250
1247
{
1251
1248
User user = userRepository .findById (userId )
1252
1249
.orElseThrow (() -> new ResourceNotFoundException ("User" , "Id" , userId .toString ()));
1253
- Servie servie = servieRepository .findById (new ServieKey ("tv" , tmdbId )).orElseGet (() -> addServie ("tv" , tmdbId ));
1250
+ Servie servie = servieRepository .findById (new ServieKey (ServieType . SERIES . toString () , tmdbId )).orElseGet (() -> addServie (ServieType . SERIES . toString () , tmdbId ));
1254
1251
UserServieData userServieData = userServieDataRepository .findById (new UserServieDataKey (user , servie ))
1255
1252
.orElseGet (() -> userServieDataRepository .save (new UserServieData (user , servie )));
1256
1253
UserSeasonData userSeasonData = userSeasonDataRepository
0 commit comments