Skip to content

Commit 6f1409e

Browse files
committed
Use an enum for the calendar weekday
1 parent 3cc1392 commit 6f1409e

3 files changed

Lines changed: 25 additions & 5 deletions

File tree

library/src/main/java/me/proxer/library/entity/media/CalendarEntry.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import lombok.Value;
77
import me.proxer.library.entity.ProxerDateItem;
88
import me.proxer.library.entity.ProxerIdItem;
9+
import me.proxer.library.enums.CalendarDay;
910
import me.proxer.library.enums.Genre;
1011

1112
import javax.annotation.Nullable;
@@ -82,7 +83,7 @@ public class CalendarEntry implements ProxerIdItem, ProxerDateItem {
8283
* Returns the day of the week, the episode is aired.
8384
*/
8485
@Json(name = "weekday")
85-
private String weekDay;
86+
private CalendarDay weekDay;
8687

8788
/**
8889
* Returns the date (and time), the episode will be uploaded.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package me.proxer.library.enums;
2+
3+
import com.squareup.moshi.Json;
4+
5+
/**
6+
* Enum holding the available days of the calendar.
7+
*
8+
* @author Ruben Gees
9+
*/
10+
public enum CalendarDay {
11+
@Json(name = "mon") MONDAY,
12+
@Json(name = "tue") TUESDAY,
13+
@Json(name = "wed") WEDNESDAY,
14+
@Json(name = "thu") THURSDAY,
15+
@Json(name = "fri") FRIDAY,
16+
@Json(name = "sat") SATURDAY,
17+
@Json(name = "sun") SUNDAY
18+
}

library/src/test/java/me/proxer/library/api/media/CalendarEndpointTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import me.proxer.library.ProxerTest;
44
import me.proxer.library.api.ProxerException;
55
import me.proxer.library.entity.media.CalendarEntry;
6+
import me.proxer.library.enums.CalendarDay;
67
import me.proxer.library.enums.Genre;
78
import okhttp3.mockwebserver.MockResponse;
89
import org.junit.Test;
@@ -46,14 +47,14 @@ public void testPath() throws ProxerException, IOException, InterruptedException
4647
private CalendarEntry buildFirstTestCalendarEntry() {
4748
return new CalendarEntry("8843", "21638", "Time Bokan: Gyakushuu no San Akunin", 18,
4849
"", new Date(1518251400L * 1000), "+09:00", "0", null,
49-
"sat", new Date(1518266091L * 1000), EnumSet.of(Genre.ADVENTURE, Genre.COMEDY, Genre.MECHA),
50-
7, 2);
50+
CalendarDay.SATURDAY, new Date(1518266091L * 1000),
51+
EnumSet.of(Genre.ADVENTURE, Genre.COMEDY, Genre.MECHA), 7, 2);
5152
}
5253

5354
private CalendarEntry buildLastTestCalendarEntry() {
5455
return new CalendarEntry("8830", "19092", "ClassicaLoid 2nd Season", 17,
5556
"", new Date(1518251700L * 1000), "+09:00", "308", "NHK",
56-
"sat", new Date(1518620676L * 1000), EnumSet.of(Genre.COMEDY, Genre.MUSIC),
57-
42, 7);
57+
CalendarDay.SATURDAY, new Date(1518620676L * 1000),
58+
EnumSet.of(Genre.COMEDY, Genre.MUSIC), 42, 7);
5859
}
5960
}

0 commit comments

Comments
 (0)