Skip to content

Server experiment hub no search #1529

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

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Server experiment hub no search #1529

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a887a9f
ExperimentHubMigrationJob: Only loop through public experiments, and …
mhadjimichael Oct 13, 2016
5f6f8f1
ExperimentHubMigration: Fixed null date npe when getting all public e…
mhadjimichael Oct 13, 2016
b295ecf
Merge branch 'server_experiment_hub' into server_experiment_hub_no_se…
mhadjimichael Oct 13, 2016
c0e154f
Merging ExperimentHubMigrationJob changes from Bob (mostly logging)
mhadjimichael Oct 13, 2016
1160c97
Merge remote-tracking branch 'upstream/develop' into server_experimen…
mhadjimichael Oct 13, 2016
bf1211f
Deleted old ExperimentHubMigrationJob.java.orig (pre-merge)
mhadjimichael Oct 13, 2016
ab64f96
ExperimentHubMigrationJob - fixed some dependencies and improved logging
mhadjimichael Oct 13, 2016
4512517
Fixed code indentation
mhadjimichael Oct 13, 2016
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
39 changes: 23 additions & 16 deletions ...src/com/google/sampling/experiential/server/migration/jobs/ExperimentHubMigrationJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import java.util.List;
import java.util.logging.Logger;

import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;

import com.google.appengine.api.datastore.DatastoreService;
import com.google.appengine.api.datastore.DatastoreServiceFactory;
import com.google.appengine.api.datastore.Entity;
Expand All @@ -34,40 +37,44 @@ public class ExperimentHubMigrationJob implements MigrationJob {
public boolean doMigrationPublicExperiments(){
//1. Loop through public experiments and fill in "modify_date"

ExperimentQueryResult experimentsQueryResults = ExperimentServiceFactory.getExperimentService().getAllExperiments(null);
ExperimentQueryResult experimentsQueryResults = ExperimentServiceFactory.getExperimentService().getExperimentsPublishedPublicly(DateTimeZone.getDefault(), null, null, null);
List<ExperimentDAO> experimentList = experimentsQueryResults.getExperiments();
log.fine("HbMigration retrieved " + experimentList.size() + "experiments");

if (experimentList != null) {
log.fine("HubMigration retrieved " + experimentList.size() + " experiments");
int modifiedExperimentCount = 0;
DateFormat df = new SimpleDateFormat(TimeUtil.DATE_FORMAT);
List<Pair<Long, Date>> experimentsWithModifyDates = Lists.newArrayList();

for (ExperimentDAO e : experimentList) {
if (e.getPublished()) {
Date date;
try{
date = df.parse(e.getModifyDate());
}catch(ParseException ex){
log.info("Could not parse date for " + e.getId() + " " + ex.toString());
date = new Date(); //fallback to "now"
modifiedExperimentCount++;
}

experimentsWithModifyDates.add(
new Pair<Long, Date>(e.getId(), date)
);
Date date;
try {
date = df.parse(e.getModifyDate());
} catch (ParseException ex) {
log.info("Could not parse date for " + e.getId() + " " + ex.toString());
date = new Date(); //fallback to "now"
modifiedExperimentCount++;
} catch (NullPointerException ex) {
log.info("Could not parse date (npe) for " + e.getId() + " " + ex.toString());
date = new Date(); //fallback to "now"
modifiedExperimentCount++;
}

experimentsWithModifyDates.add(
new Pair<Long, Date>(e.getId(), date)
);
}
log.fine("Added modifyDates to " + modifiedExperimentCount + " experiments");
updateDatastore(experimentsWithModifyDates);
}else{
log.severe("ExperimentHubMigrationJob got a null experimentList");
}

//2. Run cron job to count participants in each experiment
HubStatsCronJob cj = new HubStatsCronJob();
try {
cj.run();
}catch(IOException e){
} catch (IOException e) {
log.warning("Exception occurred while running the HubStatsCronJob during Migration: " + e.toString());
}

Expand Down