[smarcet] - #14574

* tweaks on room filters
** added external locations
** addeds rooms without floors
** filtered rooms without events

Author: smarcet

app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/AbstractVenue2VenueFilterDTO.java

@@ -0,0 +1,28 @@
+package org.openstack.android.summit.common.DTOs.Assembler.Converters;
+
+import android.util.Log;
+
+import com.crashlytics.android.Crashlytics;
+
+import org.modelmapper.AbstractConverter;
+import org.openstack.android.summit.common.Constants;
+import org.openstack.android.summit.common.DTOs.VenueFilterDTO;
+import org.openstack.android.summit.common.entities.Venue;
+
+public class AbstractVenue2VenueFilterDTO<S extends Venue> extends AbstractConverter<S, VenueFilterDTO> {
+
+    @Override
+    protected VenueFilterDTO convert(S source) {
+        VenueFilterDTO venueDTO = new VenueFilterDTO();
+        try {
+            venueDTO.setId(source.getId());
+            venueDTO.setName(source.getName());
+            venueDTO.setHasRooms(source.hasRooms());
+        } catch (Exception e) {
+            Crashlytics.logException(e);
+            Log.e(Constants.LOG_TAG, e.getMessage(), e);
+            throw e;
+        }
+        return venueDTO;
+    }
+}

app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/Venue2VenueFilterDTO.java

@@ -0,0 +1,6 @@
+package org.openstack.android.summit.common.DTOs.Assembler.Converters;
+
+import org.openstack.android.summit.common.entities.Venue;
+
+public class Venue2VenueFilterDTO extends AbstractVenue2VenueFilterDTO<Venue> {
+}

app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/Converters/VenueRealmProxy2VenueFilterDTO.java

@@ -0,0 +1,6 @@
+package org.openstack.android.summit.common.DTOs.Assembler.Converters;
+
+import io.realm.VenueRealmProxy;
+
+public class VenueRealmProxy2VenueFilterDTO extends AbstractVenue2VenueFilterDTO<VenueRealmProxy> {
+}

app/src/main/java/org/openstack/android/summit/common/DTOs/Assembler/DTOAssembler.java

@@ -19,8 +19,10 @@
 import org.openstack.android.summit.common.DTOs.Assembler.Converters.SummitEventRealmProxy2EventDetailDTO;
 import org.openstack.android.summit.common.DTOs.Assembler.Converters.SummitEventRealmProxy2ScheduleItemDTO;
 import org.openstack.android.summit.common.DTOs.Assembler.Converters.Venue2VenueDTO;
+import org.openstack.android.summit.common.DTOs.Assembler.Converters.Venue2VenueFilterDTO;
 import org.openstack.android.summit.common.DTOs.Assembler.Converters.VenueFloorRealmProxy2VenueFloorDTO;
 import org.openstack.android.summit.common.DTOs.Assembler.Converters.VenueRealmProxy2VenueDTO;
+import org.openstack.android.summit.common.DTOs.Assembler.Converters.VenueRealmProxy2VenueFilterDTO;
 import org.openstack.android.summit.common.DTOs.Assembler.Converters.VenueRoomRealmProxy2VenueRoomDTO;
 import org.openstack.android.summit.common.DTOs.Assembler.Converters.PushNotification2PushNotificationDetailDTO;
 import org.openstack.android.summit.common.DTOs.Assembler.Converters.WifiConnection2WifiListItemDTO;
@@ -58,6 +60,8 @@ public DTOAssembler() {
         modelMapper.addConverter(new PushNotification2PushNotificationDetailDTO());
         modelMapper.addConverter(new PushNotificationRealmProxy2PushNotificationDetailDTO());
         modelMapper.addConverter(new WifiConnection2WifiListItemDTO());
+        modelMapper.addConverter(new Venue2VenueFilterDTO());
+        modelMapper.addConverter(new VenueRealmProxy2VenueFilterDTO());
     }
 
     @Override

app/src/main/java/org/openstack/android/summit/common/DTOs/VenueFilterDTO.java

@@ -0,0 +1,14 @@
+package org.openstack.android.summit.common.DTOs;
+
+public class VenueFilterDTO extends NamedDTO {
+
+    private boolean hasRooms;
+
+    public boolean isHasRooms() {
+        return hasRooms;
+    }
+
+    public void setHasRooms(boolean hasRooms) {
+        this.hasRooms = hasRooms;
+    }
+}

app/src/main/java/org/openstack/android/summit/common/business_logic/IScheduleInteractor.java

@@ -2,17 +2,19 @@
 
 import org.joda.time.DateTime;
 import org.openstack.android.summit.common.DTOs.ScheduleItemDTO;
-import org.openstack.android.summit.common.DTOs.SummitDTO;
+import org.openstack.android.summit.common.filters.FilterConditions;
+
 import java.util.List;
 
 /**
  * Created by Claudio Redi on 11/18/2015.
  */
-public interface IScheduleInteractor extends IScheduleableInteractor {
+public interface IScheduleInteractor
+        extends IScheduleableInteractor {
 
-    List<ScheduleItemDTO> getScheduleEvents(DateTime startDate, DateTime endDate, List<Integer> eventTypes, List<Integer> summitTypes, List<Integer> trackGroups, List<Integer> tracks, List<String> tags, List<String> levels, List<Integer> venues, boolean showVideoTalks);
+    List<ScheduleItemDTO> getScheduleEvents(FilterConditions conditions);
 
-    List<DateTime> getDatesWithoutEvents(DateTime startDate, DateTime endDate, List<Integer> eventTypes, List<Integer> summitTypes, List<Integer> trackGroups, List<Integer> tracks, List<String> tags, List<String> levels, List<Integer> venues, boolean showVideoTalks);
+    List<DateTime> getDatesWithoutEvents(FilterConditions conditions);
 
     boolean eventExist(int id);
 

app/src/main/java/org/openstack/android/summit/common/business_logic/ScheduleInteractor.java

@@ -9,6 +9,8 @@
 import org.openstack.android.summit.common.data_access.repositories.ISummitDataStore;
 import org.openstack.android.summit.common.data_access.repositories.ISummitEventDataStore;
 import org.openstack.android.summit.common.entities.SummitEvent;
+import org.openstack.android.summit.common.filters.DateRangeCondition;
+import org.openstack.android.summit.common.filters.FilterConditions;
 import org.openstack.android.summit.common.network.IReachability;
 import org.openstack.android.summit.common.push_notifications.IPushNotificationsManager;
 import org.openstack.android.summit.common.security.ISecurityManager;
@@ -57,31 +59,13 @@ public class ScheduleInteractor extends ScheduleableInteractor implements ISched
     @Override
     public List<ScheduleItemDTO> getScheduleEvents
     (
-            DateTime startDate,
-            DateTime endDate,
-            List<Integer> eventTypes,
-            List<Integer> summitTypes,
-            List<Integer> trackGroups,
-            List<Integer> tracks,
-            List<String> tags,
-            List<String> levels,
-            List<Integer> rooms,
-            boolean showVideoTalks
+            FilterConditions conditions
     )
     {
         return postProcessScheduleEventList(createDTOList(
                 summitEventDataStore.getByFilter
                         (
-                                startDate,
-                                endDate,
-                                eventTypes,
-                                summitTypes,
-                                trackGroups,
-                                tracks,
-                                tags,
-                                levels,
-                                rooms,
-                                showVideoTalks
+                                conditions
                         ),
                 ScheduleItemDTO.class
         ));
@@ -90,32 +74,21 @@ public class ScheduleInteractor extends ScheduleableInteractor implements ISched
     @Override
     public List<DateTime> getDatesWithoutEvents
     (
-            DateTime startDate,
-            DateTime endDate,
-            List<Integer> eventTypes,
-            List<Integer> summitTypes,
-            List<Integer> trackGroups,
-            List<Integer> tracks,
-            List<String> tags,
-            List<String> levels,
-            List<Integer> rooms,
-            boolean showVideoTalks
+            FilterConditions conditions
     ) {
         ArrayList<DateTime> inactiveDates = new ArrayList<>();
         List<SummitEvent> events;
-
+        DateTime startDate = conditions.getStartDate();
+        DateTime endDate   = conditions.getEndDate();
         while (startDate.isBefore(endDate)) {
-            events = summitEventDataStore.getByFilter(
-                    startDate.withTime(0, 0, 0, 0),
-                    startDate.withTime(23, 59, 59, 999),
-                    eventTypes,
-                    summitTypes,
-                    trackGroups,
-                    tracks,
-                    tags,
-                    levels,
-                    rooms,
-                    showVideoTalks);
+            events = summitEventDataStore.getByFilter
+                    (
+                        new DateRangeCondition(
+                            startDate.withTime(0, 0, 0, 0),
+                            startDate.withTime(23, 59, 59, 999)
+                        ),
+                        conditions
+                    );
             if (events.size() == 0) {
                 inactiveDates.add(startDate);
             }

app/src/main/java/org/openstack/android/summit/common/data_access/deserialization/VenueDeserializer.java

@@ -8,6 +8,7 @@
 import org.openstack.android.summit.common.entities.Image;
 import org.openstack.android.summit.common.entities.Venue;
 import org.openstack.android.summit.common.entities.VenueFloor;
+import org.openstack.android.summit.common.entities.VenueRoom;
 import org.openstack.android.summit.common.utils.RealmFactory;
 
 import javax.inject.Inject;
@@ -18,11 +19,19 @@
 public class VenueDeserializer extends BaseDeserializer implements IVenueDeserializer {
     IGenericDeserializer genericDeserializer;
     IVenueFloorDeserializer venueFloorDeserializer;
+    IVenueRoomDeserializer venueRoomDeserializer;
 
     @Inject
-    public VenueDeserializer(IGenericDeserializer genericDeserializer, IVenueFloorDeserializer venueFloorDeserializer){
+    public VenueDeserializer
+    (
+        IGenericDeserializer genericDeserializer,
+        IVenueFloorDeserializer venueFloorDeserializer,
+        IVenueRoomDeserializer venueRoomDeserializer
+    )
+    {
         this.genericDeserializer    = genericDeserializer;
         this.venueFloorDeserializer = venueFloorDeserializer;
+        this.venueRoomDeserializer  = venueRoomDeserializer;
     }
 
     @Override
@@ -99,6 +108,22 @@ public Venue deserialize(String jsonString) throws JSONException {
             }
         }
 
+        if(jsonObject.has("rooms")) {
+            VenueRoom room;
+            JSONObject jsonObjectRoom;
+            JSONArray jsonArrayRooms = jsonObject.getJSONArray("rooms");
+            venue.getRooms().clear();
+            for (int i = 0; i < jsonArrayRooms.length(); i++) {
+                jsonObjectRoom = jsonArrayRooms.getJSONObject(i);
+                if(!jsonObjectRoom.has("floor_id")) continue;
+                int floorId    = jsonObjectRoom.getInt("floor_id");
+                if(floorId != 0) continue;
+                room           = venueRoomDeserializer.deserialize(jsonObjectRoom.toString());
+                venue.getRooms().add(room);
+                room.setVenue(venue);
+            }
+        }
+
         return venue;
     }
 }

app/src/main/java/org/openstack/android/summit/common/data_access/repositories/ISummitEventDataStore.java

@@ -3,6 +3,9 @@
 import org.joda.time.DateTime;
 import org.openstack.android.summit.common.entities.Feedback;
 import org.openstack.android.summit.common.entities.SummitEvent;
+import org.openstack.android.summit.common.filters.DateRangeCondition;
+import org.openstack.android.summit.common.filters.FilterConditions;
+
 import java.util.List;
 
 import io.reactivex.Observable;
@@ -12,7 +15,9 @@
  */
 public interface ISummitEventDataStore extends IGenericDataStore<SummitEvent> {
 
-    List<SummitEvent> getByFilter(DateTime startDate, DateTime endDate, List<Integer> eventTypes, List<Integer> summitTypes, List<Integer> trackGroups, List<Integer> tracks, List<String> tags, List<String> levels, List<Integer> venues, boolean showVideoTalks);
+    List<SummitEvent> getByFilter(FilterConditions conditions);
+
+    List<SummitEvent> getByFilter(DateRangeCondition dateRangeCondition, FilterConditions conditions);
 
     List<String> getPresentationLevels();
 
@@ -33,4 +38,8 @@ public interface ISummitEventDataStore extends IGenericDataStore<SummitEvent> {
     long countBySummitType(int sumitTypeId);
 
     long countByLevel(String level);
+
+    boolean existEventsOnRoom(int roomId);
+
+    boolean existEventsOnVenue(int venueId);
 }