Fixed test notAllowRemoveCalendarWithChildrenInOtherVersions

Removed reference to calendar in CalendarData and implemented the method
for checking if a calendar is being used by a resource in another manner

FEA: ItEr74S04BugFixing

navalplanner-business/src/main/java/org/navalplanner/business/calendars/daos/BaseCalendarDAO.java

@@ -148,12 +148,10 @@ public class BaseCalendarDAO extends IntegrationEntityDAO<BaseCalendar>
      * @param calendar
      */
     private void checkHasResources(BaseCalendar calendar) {
-        Query query = getSession().createQuery(
-                "FROM CalendarData "
-                        + "WHERE calendar IN (FROM ResourceCalendar) "
-                        + "AND parent = :parent");
-        query.setParameter("parent", calendar);
-        if (!query.list().isEmpty()) {
+        List calendars = getSession().createCriteria(ResourceCalendar.class)
+                .createCriteria("calendarDataVersions", "calendarData")
+                .add(Restrictions.eq("calendarData.parent", calendar)).list();
+        if (!calendars.isEmpty()) {
             throw ValidationException
                     .invalidValue(
                             "Cannot delete calendar. It is being used at this moment by some resources.",

navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarData.java

@@ -79,8 +79,6 @@ public class CalendarData extends IntegrationEntity {
 
     private BaseCalendar parent;
 
-    private BaseCalendar calendar;
-
     public enum Days {
         MONDAY(_("Monday")), TUESDAY(_("Tuesday")), WEDNESDAY(_("Wednesday")), THURSDAY(
                 _("Thursday")), FRIDAY(_("Friday")), SATURDAY(_("Saturday")), SUNDAY(
@@ -223,8 +221,4 @@ public class CalendarData extends IntegrationEntity {
         return Registry.getCalendarDataDAO();
     }
 
-    public BaseCalendar getCalendar() {
-        return calendar;
-    }
-
 }

navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml

@@ -127,8 +127,6 @@
         <!-- Not indexed -->
         <many-to-one name="parent" class="BaseCalendar" access="field" />
 
-        <many-to-one name="calendar" class="BaseCalendar" column="base_calendar_id" />
-
         <property name="expiringDate" access="field"
             type="org.joda.time.contrib.hibernate.PersistentLocalDate"
             column="expiring_date" />