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

[#3173]Fix logic. #3215

Merged
merged 2 commits into from
Oct 3, 2019
Merged

[#3173]Fix logic. #3215

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4934de
[#3173]Fix logic.
stellanl Oct 3, 2019
30f50d9
[#3173]Better name.
stellanl Oct 3, 2019
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
9 changes: 3 additions & 6 deletions scripts/data/src/org/akvo/gae/remoteapi/SplitAssignments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@

import com.google.appengine.api.datastore.DatastoreService;
import com.google.appengine.api.datastore.Entity;
import com.google.appengine.api.datastore.EntityNotFoundException;
import com.google.appengine.api.datastore.FetchOptions;
import com.google.appengine.api.datastore.Key;
import com.google.appengine.api.datastore.KeyFactory;
import com.google.appengine.api.datastore.PreparedQuery;
import com.google.appengine.api.datastore.Query;

Expand Down Expand Up @@ -71,7 +68,7 @@ private void processAssignments(DatastoreService ds) {
//Loop over assignments
for (Entity ass : pq.asIterable(FetchOptions.Builder.withChunkSize(500))) {

boolean splitAllowed = true;
boolean changesAllowed = true;
Long id = ass.getKey().getId();
String name = (String) ass.getProperty("name");
Map<Long, List<Long>> surveys = new HashMap<>(); //From survey ids to a list of forms
Expand Down Expand Up @@ -99,13 +96,13 @@ private void processAssignments(DatastoreService ds) {

} else if (surveyId == -1) { //Survey structure needs repair; leave it alone
System.out.println("ERROR! Form " + formId + " in assignment is in a nonexistent survey");
splitAllowed = false;
changesAllowed = false;
} else {
System.out.println("ERROR! Nonexistent form " + formId + " in assignment " + id);
}
}

if (splitAllowed && surveys.size() > 1) { //Must be split!
if (changesAllowed) { //Must be split (or just rewritten if 1 survey)
System.out.println("Rewriting assignment " + id + " in " + surveys.size() + " pieces");

int part = 0;
Expand Down