CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

Fixed Issue331 errors

Browse Source
This commit is contained in:
kushagrasingh
2013-05-10 13:11:19 +05:30
parent 97b8dab831
commit 959889175e
3 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/api/CalendarsApiResource.java
+20 -10
View File
@@ -18,9 +18,7 @@ import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext
import org.mifosplatform.portfolio.calendar.data.CalendarData; import org.mifosplatform.portfolio.calendar.data.CalendarData;
import org.mifosplatform.portfolio.calendar.domain.Calendar; import org.mifosplatform.portfolio.calendar.domain.Calendar;
import org.mifosplatform.portfolio.calendar.domain.CalendarEntityType; import org.mifosplatform.portfolio.calendar.domain.CalendarEntityType;
import org.mifosplatform.portfolio.calendar.domain.CalendarType;
import org.mifosplatform.portfolio.calendar.service.CalendarDropdownReadPlatformService; import org.mifosplatform.portfolio.calendar.service.CalendarDropdownReadPlatformService;
import org.mifosplatform.portfolio.calendar.service.CalendarEnumerations;
import org.mifosplatform.portfolio.calendar.service.CalendarReadPlatformService; import org.mifosplatform.portfolio.calendar.service.CalendarReadPlatformService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
@@ -87,6 +85,14 @@ public class CalendarsApiResource {
return this.toApiJsonSerializer.serialize(settings, calendarData, this.RESPONSE_DATA_PARAMETERS); return this.toApiJsonSerializer.serialize(settings, calendarData, this.RESPONSE_DATA_PARAMETERS);
} }
/**
* @param entityType
* @param entityId
* @param uriInfo
* @param calendarType
* @return
*/
@GET @GET
@Consumes({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON })
@Produces({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON })
@@ -99,7 +105,7 @@ public class CalendarsApiResource {
Collection<CalendarData> calendarsData = new ArrayList<CalendarData>(); Collection<CalendarData> calendarsData = new ArrayList<CalendarData>();
List<EnumOptionData> calendarTypeOptions = createEnumOptionDataListFromQueryParameter(calendarType); List<Integer> calendarTypeOptions = createIntegerListFromQueryParameter(calendarType);
if (!associationParameters.isEmpty()) { if (!associationParameters.isEmpty()) {
@@ -186,10 +192,14 @@ public class CalendarsApiResource {
} }
public List<EnumOptionData> createEnumOptionDataListFromQueryParameter(String calendarTypeQuery) { public List<Integer> createIntegerListFromQueryParameter(String calendarTypeQuery) {
List<EnumOptionData> calendarTypeOptions = new ArrayList<EnumOptionData>(); List<Integer> calendarTypeOptions = new ArrayList<Integer>();
// adding all calendar Types if // adding all calendar Types if query parameter is "all"
if(calendarTypeQuery.equalsIgnoreCase("all")){ if(calendarTypeQuery.equalsIgnoreCase("all")){
calendarTypeOptions.add(1);
calendarTypeOptions.add(2);
calendarTypeOptions.add(3);
calendarTypeOptions.add(4);
return calendarTypeOptions; return calendarTypeOptions;
} }
// creating a list of calendar type options from the comma separated query parameter. // creating a list of calendar type options from the comma separated query parameter.
@@ -201,13 +211,13 @@ public class CalendarsApiResource {
for(String calType : calendarTypeOptionsInQuery){ for(String calType : calendarTypeOptionsInQuery){
if(calType.equalsIgnoreCase("collection")) { if(calType.equalsIgnoreCase("collection")) {
calendarTypeOptions.add(CalendarEnumerations.calendarType(CalendarType.COLLECTION)); calendarTypeOptions.add(1);
} else if(calType.equalsIgnoreCase("training")) { } else if(calType.equalsIgnoreCase("training")) {
calendarTypeOptions.add(CalendarEnumerations.calendarType(CalendarType.TRAINING)); calendarTypeOptions.add(2);
} else if(calType.equalsIgnoreCase("audit")) { } else if(calType.equalsIgnoreCase("audit")) {
calendarTypeOptions.add(CalendarEnumerations.calendarType(CalendarType.AUDIT)); calendarTypeOptions.add(3);
} else if(calType.equalsIgnoreCase("general")) { } else if(calType.equalsIgnoreCase("general")) {
calendarTypeOptions.add(CalendarEnumerations.calendarType(CalendarType.GENERAL)); calendarTypeOptions.add(4);
} }
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/service/CalendarReadPlatformService.java
+3 -3
View File
@@ -5,7 +5,6 @@
*/ */
package org.mifosplatform.portfolio.calendar.service; package org.mifosplatform.portfolio.calendar.service;
import org.mifosplatform.infrastructure.core.data.EnumOptionData;
import org.mifosplatform.portfolio.calendar.data.CalendarData; import org.mifosplatform.portfolio.calendar.data.CalendarData;
import java.util.Collection; import java.util.Collection;
@@ -15,9 +14,9 @@ public interface CalendarReadPlatformService {
CalendarData retrieveCalendar(final Long calendarId, Long entityId, Integer entityTypeId); CalendarData retrieveCalendar(final Long calendarId, Long entityId, Integer entityTypeId);
Collection<CalendarData> retrieveCalendarsByEntity(final Long entityId, final Integer entityTypeId, List<EnumOptionData> calendarTypeOptions); Collection<CalendarData> retrieveCalendarsByEntity(final Long entityId, final Integer entityTypeId, List<Integer> calendarTypeOptions);
Collection<CalendarData> retrieveParentCalendarsByEntity(final Long entityId, final Integer entityTypeId, List<EnumOptionData> calendarTypeOptions); Collection<CalendarData> retrieveParentCalendarsByEntity(final Long entityId, final Integer entityTypeId, List<Integer> calendarTypeOptions);
Collection<CalendarData> retrieveAllCalendars(); Collection<CalendarData> retrieveAllCalendars();
@@ -28,4 +27,5 @@ public interface CalendarReadPlatformService {
Collection<CalendarData> generateRecurringDates(final Collection<CalendarData> calendarsData); Collection<CalendarData> generateRecurringDates(final Collection<CalendarData> calendarsData);
CalendarData retrieveLoanCalendar(final Long loanId); CalendarData retrieveLoanCalendar(final Long loanId);
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/service/CalendarReadPlatformServiceImpl.java
+15 -17
View File
@@ -99,7 +99,7 @@ public class CalendarReadPlatformServiceImpl implements CalendarReadPlatformServ
} }
@Override @Override
public Collection<CalendarData> retrieveCalendarsByEntity(final Long entityId, final Integer entityTypeId, List<EnumOptionData> calendarTypeOptions) { public Collection<CalendarData> retrieveCalendarsByEntity(final Long entityId, final Integer entityTypeId, List<Integer> calendarTypeOptions) {
final CalendarDataMapper rm = new CalendarDataMapper(); final CalendarDataMapper rm = new CalendarDataMapper();
// the collection result will store the final result // the collection result will store the final result
Collection<CalendarData> result=null; Collection<CalendarData> result=null;
@@ -110,15 +110,15 @@ public class CalendarReadPlatformServiceImpl implements CalendarReadPlatformServ
sql = rm.schema() + " and ci.entity_id = ? and ci.entity_type_enum = ? order by c.start_date "; sql = rm.schema() + " and ci.entity_id = ? and ci.entity_type_enum = ? order by c.start_date ";
result = this.jdbcTemplate.query(sql, rm, new Object[] { entityId, entityTypeId }); result = this.jdbcTemplate.query(sql, rm, new Object[] { entityId, entityTypeId });
} else if(!calendarTypeOptions.isEmpty()){ } else if(!calendarTypeOptions.isEmpty()){
String sqlCalendarTypeOptions = createSqlValuesInString(calendarTypeOptions); String sqlCalendarTypeOptions = getSqlCalendarTypeOptionsInString(calendarTypeOptions);
sql = rm.schema() + " and ci.entity_id = ? and ci.entity_type_enum = ? and c.calendar_type_enum in (?) order by c.start_date "; sql = rm.schema() + " and ci.entity_id = ? and ci.entity_type_enum = ? and c.calendar_type_enum in ( "+ sqlCalendarTypeOptions + " ) order by c.start_date ";
result = this.jdbcTemplate.query(sql,rm, new Object[] {entityId, entityTypeId, sqlCalendarTypeOptions}); result = this.jdbcTemplate.query(sql, rm, new Object[]{entityId, entityTypeId});
} }
return result; return result;
} }
@Override @Override
public Collection<CalendarData> retrieveParentCalendarsByEntity( Long entityId, Integer entityTypeId, List<EnumOptionData> calendarTypeOptions ) { public Collection<CalendarData> retrieveParentCalendarsByEntity( Long entityId, Integer entityTypeId, List<Integer> calendarTypeOptions ) {
final CalendarDataMapper rm = new CalendarDataMapper(); final CalendarDataMapper rm = new CalendarDataMapper();
Collection<CalendarData> result=null; Collection<CalendarData> result=null;
@@ -131,9 +131,9 @@ public class CalendarReadPlatformServiceImpl implements CalendarReadPlatformServ
sql = rm.schema() + " " + parentHeirarchyCondition + " and ci.entity_type_enum = ? order by c.start_date "; sql = rm.schema() + " " + parentHeirarchyCondition + " and ci.entity_type_enum = ? order by c.start_date ";
result = this.jdbcTemplate.query(sql, rm, new Object[] { entityId, CalendarEntityType.CENTERS.getValue() }); result = this.jdbcTemplate.query(sql, rm, new Object[] { entityId, CalendarEntityType.CENTERS.getValue() });
} else { } else {
String sqlCalendarTypeOptions = createSqlValuesInString(calendarTypeOptions); String sqlCalendarTypeOptions = getSqlCalendarTypeOptionsInString(calendarTypeOptions);
sql = rm.schema() + " " + parentHeirarchyCondition + " and ci.entity_type_enum = ? and c.calendar_type_enum in ? order by c.start_date "; sql = rm.schema() + " " + parentHeirarchyCondition + " and ci.entity_type_enum = ? and c.calendar_type_enum in ("+ sqlCalendarTypeOptions +") order by c.start_date ";
result = this.jdbcTemplate.query(sql,rm, new Object[] {entityId, entityTypeId, sqlCalendarTypeOptions}); result = this.jdbcTemplate.query(sql,rm, new Object[] {entityId, entityTypeId});
} }
return result; return result;
} }
@@ -231,22 +231,20 @@ public class CalendarReadPlatformServiceImpl implements CalendarReadPlatformServ
} }
/** /**
* This method takes the List of calendarType options given in the request and creates a string to be used in the sql statement. * function returns a comma separated list of calendar_type_enum values ex. 1,2,3,4
* for ex. (1,2,3,4)
* @param calendarTypeOptions * @param calendarTypeOptions
* @return * @return
*/ */
public String createSqlValuesInString(List<EnumOptionData> calendarTypeOptions){ public String getSqlCalendarTypeOptionsInString(List<Integer> calendarTypeOptions){
String sqlCalendarTypeOptions = "";
int size = calendarTypeOptions.size(); int size = calendarTypeOptions.size();
String sqlCalendarTypeOptions = "(" + calendarTypeOptions.get(0).getId().toString(); for(int i=0;i<size-1;i++)
for(int i=1;i<size;i++) { {
sqlCalendarTypeOptions += "," + calendarTypeOptions.get(i).getId().toString(); sqlCalendarTypeOptions += calendarTypeOptions.get(i).toString() + ",";
} }
sqlCalendarTypeOptions += ")"; sqlCalendarTypeOptions += calendarTypeOptions.get(size-1).toString();
return sqlCalendarTypeOptions; return sqlCalendarTypeOptions;
} }
} }