Commit 6c48d38b authored by Christos Tranoris's avatar Christos Tranoris
Browse files

closes #8

parent 0d9cb0d9

src/main/java/org/etsi/osl/tmf/sim638/repo/ServiceActionQueueRepository.java

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ package org.etsi.osl.tmf.sim638.repo; 


import java.util.List;

import java.util.Optional;

import org.etsi.osl.tmf.sim638.model.ServiceActionQueueAction;

import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;

import org.springframework.data.repository.CrudRepository;

import org.springframework.data.repository.PagingAndSortingRepository;
@@ -35,4 +36,11 @@ public interface ServiceActionQueueRepository extends CrudRepository<ServiceActi 
	Optional<ServiceActionQueueItem> findByUuid(String id);



	List<ServiceActionQueueItem> findFirst10ByOrderByInsertedDate();



  List<ServiceActionQueueItem> findByServiceRefIdAndAction(String serviceRefId,

      ServiceActionQueueAction action);

  



  void deleteByServiceRefIdAndAction(String serviceRefId,

      ServiceActionQueueAction action);

}

src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java

+6 −0
Original line number Diff line number Diff line
@@ -799,6 +799,12 @@ public class ServiceRepoService { 
	

	public ServiceActionQueueItem  addServiceActionQueueItem(@Valid ServiceActionQueueItem item) {

		logger.debug("Will add ServiceActionQueueItem ServiceRefId: " + item.getServiceRefId() );

		

		//find any similar action inqueue and delete them, so to keep this one as the most recent

		//List<ServiceActionQueueItem> result = this.serviceActionQueueRepo.findByServiceRefIdAndAction(item.getServiceRefId(), item.getAction());

        //logger.debug("Will add ServiceActionQueueItem ServiceRefId result: " +result.size() );

        this.serviceActionQueueRepo.deleteByServiceRefIdAndAction(item.getServiceRefId(), item.getAction());

        

		return this.serviceActionQueueRepo.save( item);

	}

src/main/resources/application.yml

+1 −1
Original line number Diff line number Diff line 
origins: http://localhost,http://localhost:13082,http://127.0.0.1:13082,https://localhost, 

origins: http://localhost,http://localhost:8888,http://localhost:13082,http://127.0.0.1:13082,https://localhost, 

permit-all: /tmf-api/**