github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

[API] Remove duplicated POJOs (#53)

Browse Source
This commit is contained in:
Mikołaj Pich
2018-03-04 13:24:37 +01:00
committed by Rafał Borcz
parent 79bdbbbb16
commit 4c7c2a1101
24 changed files with 215 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/io/github/wulkanowy/data/sync/timetable/TimetableSync.java
View File

@ -42,7 +42,8 @@ public class TimetableSync implements TimetableSyncContract {
public void syncTimetable(String date) throws NotLoggedInErrorException, IOException, ParseException {
long userId = sharedPref.getCurrentUserId();
io.github.wulkanowy.api.timetable.Week weekFromNet = date == null ? vulcan.getTimetable().getWeekTable()
io.github.wulkanowy.api.generic.Week<io.github.wulkanowy.api.generic.Day> weekFromNet =
date == null ? vulcan.getTimetable().getWeekTable()
: vulcan.getTimetable().getWeekTable(String.valueOf(TimeUtils.getNetTicks(date)));
Week weekFromDb = daoSession.getWeekDao().queryBuilder()
@ -59,11 +60,11 @@ public class TimetableSync implements TimetableSyncContract {
weekId = weekFromDb.getId();
}
List<io.github.wulkanowy.api.timetable.Day> dayListFromNet = weekFromNet.getDays();
List<io.github.wulkanowy.api.generic.Day> dayListFromNet = weekFromNet.getDays();
List<Lesson> updatedLessonList = new ArrayList<>();
for (io.github.wulkanowy.api.timetable.Day dayFromNet : dayListFromNet) {
for (io.github.wulkanowy.api.generic.Day dayFromNet : dayListFromNet) {
Day dayFromNetEntity = DataObjectConverter.dayToDayEntity(dayFromNet);
Day dayFromDb = daoSession.getDayDao().queryBuilder()

14
app/src/main/java/io/github/wulkanowy/utils/DataObjectConverter.java
View File

@ -52,11 +52,11 @@ public final class DataObjectConverter {
return gradeEntityList;
}
public static Week weekToWeekEntity(io.github.wulkanowy.api.timetable.Week week) {
public static Week weekToWeekEntity(io.github.wulkanowy.api.generic.Week week) {
return new Week().setStartDayDate(week.getStartDayDate());
}
public static Day dayToDayEntity(io.github.wulkanowy.api.timetable.Day day) {
public static Day dayToDayEntity(io.github.wulkanowy.api.generic.Day day) {
return new Day()
.setDate(day.getDate())
.setDayName(day.getDayName())
@ -65,17 +65,17 @@ public final class DataObjectConverter {
}
public static List<Day> daysToDaysEntities(List<io.github.wulkanowy.api.timetable.Day> dayList) {
public static List<Day> daysToDaysEntities(List<io.github.wulkanowy.api.generic.Day> dayList) {
List<Day> dayEntityList = new ArrayList<>();
for (io.github.wulkanowy.api.timetable.Day day : dayList) {
for (io.github.wulkanowy.api.generic.Day day : dayList) {
dayEntityList.add(dayToDayEntity(day));
}
return dayEntityList;
}
public static Lesson lessonToLessonEntity(io.github.wulkanowy.api.timetable.Lesson lesson) {
public static Lesson lessonToLessonEntity(io.github.wulkanowy.api.generic.Lesson lesson) {
return new Lesson()
.setNumber(lesson.getNumber())
.setSubject(lesson.getSubject())
@ -94,11 +94,11 @@ public final class DataObjectConverter {
.setNewMovedInOrChanged(lesson.isNewMovedInOrChanged());
}
public static List<Lesson> lessonsToLessonsEntities(List<io.github.wulkanowy.api.timetable.Lesson> lessonList) {
public static List<Lesson> lessonsToLessonsEntities(List<io.github.wulkanowy.api.generic.Lesson> lessonList) {
List<Lesson> lessonEntityList = new ArrayList<>();
for (io.github.wulkanowy.api.timetable.Lesson lesson : lessonList) {
for (io.github.wulkanowy.api.generic.Lesson lesson : lessonList) {
lessonEntityList.add(lessonToLessonEntity(lesson));
}
return lessonEntityList;

4
app/src/test/java/io/github/wulkanowy/utils/DataObjectConverterTest.java
View File

@ -8,8 +8,8 @@ import java.util.List;
import io.github.wulkanowy.api.grades.Grade;
import io.github.wulkanowy.api.grades.Subject;
import io.github.wulkanowy.api.timetable.Day;
import io.github.wulkanowy.api.timetable.Lesson;
import io.github.wulkanowy.api.generic.Day;
import io.github.wulkanowy.api.generic.Lesson;
public class DataObjectConverterTest {