Fixed cache-evict for concept set delete.

Changed asset cache key to use login always due to read/write permissions being assigned at a per-user basis.

Author: chrisknoll

src/main/java/org/ohdsi/webapi/service/CohortDefinitionService.java

@@ -431,7 +431,7 @@ public GenerateSqlResult generateSql(GenerateSqlRequest request) {
 	@Path("/")
 	@Produces(MediaType.APPLICATION_JSON)
 	@Transactional
-	@Cacheable(cacheNames = CachingSetup.COHORT_DEFINITION_LIST_CACHE, key = "@permissionService.getAssetListCacheKey()")
+	@Cacheable(cacheNames = CachingSetup.COHORT_DEFINITION_LIST_CACHE, key = "@permissionService.getSubjectCacheKey()")
 	public List<CohortMetadataDTO> getCohortDefinitionList() {
 		List<CohortDefinition> definitions = cohortDefinitionRepository.list();
 		return definitions.stream()

src/main/java/org/ohdsi/webapi/service/ConceptSetService.java

@@ -162,7 +162,7 @@ public ConceptSetDTO getConceptSet(@PathParam("id") final int id) {
     @GET
     @Path("/")
     @Produces(MediaType.APPLICATION_JSON)
-	@Cacheable(cacheNames = ConceptSetService.CachingSetup.CONCEPT_SET_LIST_CACHE, key = "@permissionService.getAssetListCacheKey()")
+    @Cacheable(cacheNames = ConceptSetService.CachingSetup.CONCEPT_SET_LIST_CACHE, key = "@permissionService.getSubjectCacheKey()")
     public Collection<ConceptSetDTO> getConceptSets() {
         return getTransactionTemplate().execute(
                 transactionStatus -> StreamSupport.stream(getConceptSetRepository().findAll().spliterator(), false)
@@ -481,7 +481,7 @@ public Response exportConceptSetToCSV(@PathParam("id") final String id) throws E
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-	@CacheEvict(cacheNames = CachingSetup.CONCEPT_SET_LIST_CACHE, allEntries = true)
+    @CacheEvict(cacheNames = CachingSetup.CONCEPT_SET_LIST_CACHE, allEntries = true)
     public ConceptSetDTO createConceptSet(ConceptSetDTO conceptSetDTO) {
 
         UserEntity user = userRepository.findByLogin(security.getSubject());
@@ -609,6 +609,7 @@ public Collection<ConceptSetGenerationInfo> getConceptSetGenerationInfo(@PathPar
   @DELETE
   @Transactional(rollbackOn = Exception.class, dontRollbackOn = EmptyResultDataAccessException.class)
   @Path("{id}")
+	@CacheEvict(cacheNames = CachingSetup.CONCEPT_SET_LIST_CACHE, allEntries = true)
   public void deleteConceptSet(@PathParam("id") final int id) {
       // Remove any generation info
       try {
@@ -656,6 +657,7 @@ public void deleteConceptSet(@PathParam("id") final int id) {
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/{id}/tag/")
     @Transactional
+    @CacheEvict(cacheNames = CachingSetup.CONCEPT_SET_LIST_CACHE, allEntries = true)
     public void assignTag(@PathParam("id") final Integer id, final int tagId) {
         ConceptSet entity = getConceptSetRepository().findById(id);
         checkOwnerOrAdminOrGranted(entity);