From fff8f0c792606daff151624479d9ae9dc54187d5 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Wed, 14 Dec 2016 17:34:34 +0500 Subject: Calendars implementation --- src/org/traccar/model/Calendar.java | 86 +++++++++++++++++++++++++++ src/org/traccar/model/CalendarPermission.java | 40 +++++++++++++ src/org/traccar/model/Geofence.java | 9 +++ 3 files changed, 135 insertions(+) create mode 100644 src/org/traccar/model/Calendar.java create mode 100644 src/org/traccar/model/CalendarPermission.java (limited to 'src/org/traccar/model') diff --git a/src/org/traccar/model/Calendar.java b/src/org/traccar/model/Calendar.java new file mode 100644 index 000000000..e1ae5a93d --- /dev/null +++ b/src/org/traccar/model/Calendar.java @@ -0,0 +1,86 @@ +/* + * Copyright 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.model; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.sql.SQLException; +import java.util.Collection; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +import net.fortuna.ical4j.data.CalendarBuilder; +import net.fortuna.ical4j.data.ParserException; +import net.fortuna.ical4j.filter.Filter; +import net.fortuna.ical4j.filter.PeriodRule; +import net.fortuna.ical4j.filter.Rule; +import net.fortuna.ical4j.model.Component; +import net.fortuna.ical4j.model.DateTime; +import net.fortuna.ical4j.model.Dur; +import net.fortuna.ical4j.model.Period; +import net.fortuna.ical4j.model.component.CalendarComponent; +import net.fortuna.ical4j.validate.ValidationException; + +public class Calendar extends Extensible { + + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + private byte[] calendarData; + + public byte[] getCalendarData() throws ValidationException, IOException { + return calendarData.clone(); + } + + public void setCalendarData(byte[] calendarData) throws IOException, ParserException, SQLException { + setCalendar(calendarData); + } + + private net.fortuna.ical4j.model.Calendar calendar; + + @JsonIgnore + public net.fortuna.ical4j.model.Calendar getCalendar() { + return calendar; + } + + public void setCalendar(byte[] calendarData) throws IOException, ParserException, SQLException { + CalendarBuilder builder = new CalendarBuilder(); + calendar = builder.build(new ByteArrayInputStream(calendarData)); + this.calendarData = calendarData.clone(); + } + + public boolean checkMoment(Date date) { + if (calendar != null) { + Period period = new Period(new DateTime(date), new Dur(0, 0, 0, 1)); + Rule periodRule = new PeriodRule(period); + Filter filter = new Filter(new Rule[] {periodRule}, Filter.MATCH_ANY); + Collection events = filter.filter(calendar.getComponents(Component.VEVENT)); + if (events != null && !events.isEmpty()) { + return true; + } + } + return false; + } +} diff --git a/src/org/traccar/model/CalendarPermission.java b/src/org/traccar/model/CalendarPermission.java new file mode 100644 index 000000000..59f54e07b --- /dev/null +++ b/src/org/traccar/model/CalendarPermission.java @@ -0,0 +1,40 @@ +/* + * Copyright 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.model; + +public class CalendarPermission { + + private long userId; + + public long getUserId() { + return userId; + } + + public void setUserId(long userId) { + this.userId = userId; + } + + private long calendarId; + + public long getCalendarId() { + return calendarId; + } + + public void setCalendarId(long calendarId) { + this.calendarId = calendarId; + } +} diff --git a/src/org/traccar/model/Geofence.java b/src/org/traccar/model/Geofence.java index 326c45b5f..f10ce6862 100644 --- a/src/org/traccar/model/Geofence.java +++ b/src/org/traccar/model/Geofence.java @@ -84,4 +84,13 @@ public class Geofence extends Extensible { this.geometry = geometry; } + private long calendarId; + + public long getCalendarId() { + return calendarId; + } + + public void setCalendarId(long calendarId) { + this.calendarId = calendarId; + } } -- cgit v1.2.3 From ef9148eea8dd404aba5707898f244a4b7bc26feb Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 15 Dec 2016 09:45:29 +0500 Subject: - Set period duration to 0 - Remove setter - Added test cases - Style fix --- pom.xml | 6 +++--- src/org/traccar/model/Calendar.java | 12 ++++-------- test/org/traccar/calendar/CalendarTest.java | 14 +++++++++----- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/org/traccar/model') diff --git a/pom.xml b/pom.xml index b93ff8e44..3d142b7cf 100644 --- a/pom.xml +++ b/pom.xml @@ -144,9 +144,9 @@ 1.7 - org.mnode.ical4j - ical4j - 2.0.0 + org.mnode.ical4j + ical4j + 2.0.0 diff --git a/src/org/traccar/model/Calendar.java b/src/org/traccar/model/Calendar.java index e1ae5a93d..19b5fde16 100644 --- a/src/org/traccar/model/Calendar.java +++ b/src/org/traccar/model/Calendar.java @@ -55,7 +55,9 @@ public class Calendar extends Extensible { } public void setCalendarData(byte[] calendarData) throws IOException, ParserException, SQLException { - setCalendar(calendarData); + CalendarBuilder builder = new CalendarBuilder(); + calendar = builder.build(new ByteArrayInputStream(calendarData)); + this.calendarData = calendarData.clone(); } private net.fortuna.ical4j.model.Calendar calendar; @@ -65,15 +67,9 @@ public class Calendar extends Extensible { return calendar; } - public void setCalendar(byte[] calendarData) throws IOException, ParserException, SQLException { - CalendarBuilder builder = new CalendarBuilder(); - calendar = builder.build(new ByteArrayInputStream(calendarData)); - this.calendarData = calendarData.clone(); - } - public boolean checkMoment(Date date) { if (calendar != null) { - Period period = new Period(new DateTime(date), new Dur(0, 0, 0, 1)); + Period period = new Period(new DateTime(date), new Dur(0, 0, 0, 0)); Rule periodRule = new PeriodRule(period); Filter filter = new Filter(new Rule[] {periodRule}, Filter.MATCH_ANY); Collection events = filter.filter(calendar.getComponents(Component.VEVENT)); diff --git a/test/org/traccar/calendar/CalendarTest.java b/test/org/traccar/calendar/CalendarTest.java index 44fc9539b..7f5bd7d29 100644 --- a/test/org/traccar/calendar/CalendarTest.java +++ b/test/org/traccar/calendar/CalendarTest.java @@ -42,13 +42,17 @@ public class CalendarTest { "END:VEVENT\n" + "END:VCALENDAR"; Calendar calendar = new Calendar(); - calendar.setCalendar(calendarString.getBytes()); + calendar.setCalendarData(calendarString.getBytes()); DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ssX"); - - Date date = format.parse("2016-12-13 23:01:00+05"); + + Date date = format.parse("2016-12-13 22:59:59+05"); + Assert.assertTrue(!calendar.checkMoment(date)); + date = format.parse("2016-12-13 23:00:01+05"); + Assert.assertTrue(calendar.checkMoment(date)); + + date = format.parse("2016-12-13 06:59:59+05"); Assert.assertTrue(calendar.checkMoment(date)); - - date = format.parse("2016-12-13 07:01:00+05"); + date = format.parse("2016-12-13 07:00:01+05"); Assert.assertTrue(!calendar.checkMoment(date)); } } -- cgit v1.2.3