Skip to content
This repository was archived by the owner on Oct 25, 2019. It is now read-only.

Commit 50cfa9e

Browse files
committed
corrected delete
1 parent 75d08bf commit 50cfa9e

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

src/main/java/tlc/tracking/RunResource.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import java.util.Arrays;
1212
import java.util.Collection;
13+
import java.util.List;
1314

1415
public class RunResource extends ServerResource {
1516

@@ -63,13 +64,10 @@ public RecordList search() {
6364
@Delete("json")
6465
public void bulkDelete() {
6566
final String[] run_ids = getRequest().getAttributes().get("list").toString().split(",");
66-
67-
Arrays.stream(run_ids)
68-
.map(Long::valueOf)
69-
.map(this.service::findById)
70-
.flatMap(Collection::stream)
71-
.map(Record::getId)
72-
.forEach(this.service::delete);
67+
for (String id: run_ids) {
68+
List<Record> records = this.service.findById(Long.valueOf(id));
69+
records.forEach(r -> this.service.delete(r.getId()));
70+
}
7371

7472
}
7573

src/main/java/tlc/tracking/impl/GoogleDataStoreService.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,15 @@ public RecordList find(String user, Long id, Double lon, Double lat, Long timest
9393

9494
@Override
9595
public void delete(long id) {
96-
// Recréer la clé
97-
final Key key = longToKey(id);
98-
// Supprime l'enregistrement
99-
DATA_STORE.delete(key);
96+
final EntityQuery query = newEntityQueryBuilder()
97+
.setKind("Record")
98+
.setFilter(PropertyFilter.eq("id", id))
99+
.build();
100+
101+
final QueryResults<Entity> results = DATA_STORE.run(query);
102+
while (results.hasNext()) {
103+
DATA_STORE.delete(results.next().getKey());
104+
}
100105
}
101106

102107
@Override

0 commit comments

Comments
 (0)