Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
33017abc
by tchemit at 2019-01-11T09:56:30Z
2 changed files:
- services-local/src/main/java/fr/ird/observe/services/local/ObserveSecurityHelper.java
- services-local/src/main/java/fr/ird/observe/services/local/service/data/NavigationServiceLocal.java
Changes:
| ... | ... | @@ -22,6 +22,7 @@ package fr.ird.observe.services.local; |
| 22 | 22 |
* #L%
|
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 |
+import com.google.common.collect.ImmutableSet;
|
|
| 25 | 26 |
import com.google.common.collect.Iterables;
|
| 26 | 27 |
import com.google.common.collect.Sets;
|
| 27 | 28 |
import fr.ird.observe.dto.ObserveDbRole;
|
| ... | ... | @@ -119,7 +120,7 @@ public class ObserveSecurityHelper { |
| 119 | 120 |
|
| 120 | 121 |
private void createSecurityScript(Set<ObserveDbUserDto> users, SqlScriptWriter sqlScriptWriter) {
|
| 121 | 122 |
|
| 122 |
- Set<String> schemas = ObserveTopiaApplicationContext.newModelSupport().getMetadataModel().getSchemaNames();
|
|
| 123 |
+ Set<String> schemas = ImmutableSet.<String>builder().add(SCHEMA_PUBLIC).addAll(ObserveTopiaApplicationContext.newModelSupport().getMetadataModel().getSchemaNames()).build();
|
|
| 123 | 124 |
|
| 124 | 125 |
List<Pair<String, String>> tables = jdbcHelper.getTables(schemas, EXTRA_TABLES);
|
| 125 | 126 |
|
| ... | ... | @@ -32,6 +32,7 @@ import fr.ird.observe.dto.reference.DataDtoReferenceSet; |
| 32 | 32 |
import fr.ird.observe.dto.referential.common.ProgramHelper;
|
| 33 | 33 |
import fr.ird.observe.dto.referential.common.ProgramReference;
|
| 34 | 34 |
import fr.ird.observe.entities.ObserveTopiaPersistenceContext;
|
| 35 |
+import fr.ird.observe.services.configuration.ObserveDataSourceConnection;
|
|
| 35 | 36 |
import fr.ird.observe.services.local.service.ObserveServiceLocal;
|
| 36 | 37 |
import fr.ird.observe.services.service.data.NavigationRequest;
|
| 37 | 38 |
import fr.ird.observe.services.service.data.NavigationResult;
|
| ... | ... | @@ -57,9 +58,9 @@ public class NavigationServiceLocal extends ObserveServiceLocal implements Navig |
| 57 | 58 |
Set<ProgramReference> allPrograms = serviceContext.newService(ReferentialService.class).getReferenceSet(ProgramReference.class, null).toSet();
|
| 58 | 59 |
ImmutableMap<String, ProgramReference> programsById = Maps.uniqueIndex(allPrograms, ProgramReference::getId);
|
| 59 | 60 |
|
| 60 |
- |
|
| 61 |
- boolean loadLongline = request.isLoadLongline();
|
|
| 62 |
- boolean loadSeine = request.isLoadSeine();
|
|
| 61 |
+ boolean canReadData = serviceContext.getDataSourceConnection().map(ObserveDataSourceConnection::canReadData).orElse(false);
|
|
| 62 |
+ boolean loadLongline = request.isLoadLongline() && canReadData;
|
|
| 63 |
+ boolean loadSeine = request.isLoadSeine()&& canReadData;
|
|
| 63 | 64 |
boolean loadEmptyProgram = request.isLoadEmptyProgram();
|
| 64 | 65 |
|
| 65 | 66 |
ArrayListMultimap<ProgramReference, TripSeineReference> tripsSeineByProgram = ArrayListMultimap.create();
|