Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update trip status on request on delete #7

Merged
merged 3 commits into from
Sep 24, 2021
Merged

Update trip status on request on delete #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c208596
fix(delete-trip): update trip status on request on delete
landonreed Jul 30, 2021
5dba8c5
refactor: add back fieldTripSummaryWriter
landonreed Aug 4, 2021
dbf308c
refactor(FieldTrip): Address PR comments
binh-dam-ibigroup Sep 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 32 additions & 38 deletions app/controllers/FieldTrip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,7 @@
import models.fieldtrip.GTFSTrip;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
import static controllers.Application.checkLogin;
import static controllers.Calltaker.checkAccess;
import play.*;
import play.mvc.*;

Expand All @@ -26,18 +20,37 @@
import models.fieldtrip.FieldTripNote;
import play.data.binding.As;

import javax.ws.rs.core.MediaType;
import com.sun.jersey.api.client.*;
import java.io.BufferedReader;
import java.io.DataOutputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
import java.net.URL;
import javax.net.ssl.HttpsURLConnection;
import org.apache.commons.codec.digest.DigestUtils;


public class FieldTrip extends Application {

/**
* Gson exclusion strategy designed to skip fields that could contribute to an overly large JSON response.
*/
private static final ExclusionStrategy fieldTripExclusionStrategy = new ExclusionStrategy() {
public boolean shouldSkipField(FieldAttributes fa) {
String name = fa.getName();
return(name.equals("trips") || name.equals("notes") || name.equals("feedback"));
}
public boolean shouldSkipClass(Class<?> type) {
return false;
}
};

/**
* Construct Gson writer to skip large fields for the shortened {@link FieldTripRequest} summary response.
*/
private static final Gson fieldTripSummaryWriter = new GsonBuilder()
.excludeFieldsWithoutExposeAnnotation()
.setExclusionStrategies(fieldTripExclusionStrategy)
.serializeNulls()
.create();

@Util
public static void checkAccess(TrinetUser user) {
Expand Down Expand Up @@ -291,6 +304,12 @@ public static void deleteTrip(Long id) {
checkAccess(user);

ScheduledFieldTrip trip = ScheduledFieldTrip.findById(id);
if (trip.requestOrder == 0) {
trip.request.outboundTripStatus = null;
} else {
trip.request.inboundTripStatus = null;
}
trip.request.save();
trip.delete();
renderJSON(id);
}
Expand Down Expand Up @@ -436,29 +455,10 @@ public static void getRequestsSummary(Integer limit) {

List<FieldTripRequest> requests;
String sql = "order by timeStamp desc";
if(limit == null)
requests = FieldTripRequest.find(sql).fetch();
else {
requests = FieldTripRequest.find(sql).fetch(limit);
}
if (limit == null) requests = FieldTripRequest.find(sql).fetch();
else requests = FieldTripRequest.find(sql).fetch(limit);

Gson gson = new GsonBuilder()
.excludeFieldsWithoutExposeAnnotation()
.setExclusionStrategies(new ExclusionStrategy() {

public boolean shouldSkipField(FieldAttributes fa) {
String name = fa.getName();
return(name.equals("trips") || name.equals("notes") || name.equals("feedback"));
}

public boolean shouldSkipClass(Class<?> type) {
return false;
}

})
.serializeNulls()
.create();
renderJSON(gson.toJson(requests));
renderJSON(fieldTripSummaryWriter.toJson(requests));
}

public static void setRequestStatus(long requestId, String status) {
Expand Down Expand Up @@ -549,7 +549,6 @@ public static void setRequestDate(long requestId, @As("MM/dd/yyyy") Date date) {
public static void setRequestGroupSize(long requestId, int numStudents, int numFreeStudents, int numChaperones) {
TrinetUser user = checkLogin();
checkAccess(user);

FieldTripRequest req = FieldTripRequest.findById(requestId);
if(req != null) {
req.numStudents = numStudents;
Expand Down Expand Up @@ -657,12 +656,7 @@ public static void searchRequests(String query, String teacherValue, String scho
List<FieldTripRequest> requests;
if(date2 == null) requests = FieldTripRequest.find(query, teacherValue, schoolValue, date1).fetch();
else requests = FieldTripRequest.find(query, teacherValue, schoolValue, date1, date2).fetch();

Gson gson = new GsonBuilder()
.excludeFieldsWithoutExposeAnnotation()
.serializeNulls()
.create();
renderJSON(gson.toJson(requests));
renderJSON(fieldTripSummaryWriter.toJson(requests));
}

/* Receipt Generation */
Expand Down
3 changes: 2 additions & 1 deletion app/models/fieldtrip/ScheduledFieldTrip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ public class ScheduledFieldTrip extends GenericModel {

@ManyToOne(optional=false)
public FieldTripRequest request;


/** 0 for outbound, 1 for inbound */
@Expose
public Integer requestOrder;

Expand Down