geng

src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -166,5 +166,5 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
 
     Collection findFirstByOnShelfAndAssetId(boolean onShelf, Long assetId);
 
-    List<Collection> findAllByOasisIdInAndSourceAndSaleLessThan(List<Long> oasisIds, CollectionSource source, int sale);
+    List<Collection> findAllByOasisIdInAndSourceInAndSaleLessThan(List<Long> oasisIds, List<CollectionSource> sources, int sale);
 }

src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -623,8 +623,11 @@ public class CollectionService {
     }
 
     public List<Collection> setOasisScancode(List<Long> oasisIds) {
+        List<CollectionSource> collectionSources = new ArrayList<>();
+        collectionSources.add(CollectionSource.COMPANY);
+        collectionSources.add(CollectionSource.OFFICIAL);
         List<Collection> collections = collectionRepo
-                .findAllByOasisIdInAndSourceAndSaleLessThan(oasisIds, CollectionSource.COMPANY, 1);
+                .findAllByOasisIdInAndSourceInAndSaleLessThan(oasisIds, collectionSources, 1);
         List<Collection> result = new ArrayList<>();
         collections.forEach(collection -> {
             collection.setOnShelf(false);
@@ -637,8 +640,11 @@ public class CollectionService {
     }
 
     public List<Collection> setOasisOnShelf(List<Long> oasisIds) {
+        List<CollectionSource> collectionSources = new ArrayList<>();
+        collectionSources.add(CollectionSource.COMPANY);
+        collectionSources.add(CollectionSource.OFFICIAL);
         List<Collection> collections = collectionRepo
-                .findAllByOasisIdInAndSourceAndSaleLessThan(oasisIds, CollectionSource.COMPANY, 1);
+                .findAllByOasisIdInAndSourceInAndSaleLessThan(oasisIds, collectionSources, 1);
         List<Collection> result = new ArrayList<>();
         collections.forEach(collection -> {
             collection.setOnShelf(true);

src/main/java/com/izouma/nineth/service/CompanyCollectionService.java

@@ -111,8 +111,11 @@ public class CompanyCollectionService {
                 .findAllByOasisIdInAndStatusIn(oasisIds, assetStatuses);
         List<CompanyCollection> companyCollections = companyCollectionRepo
                 .findAllByOasisIdInAndStatusNot(oasisIds, CollectionStatus.SUCCESS);
+        List<CollectionSource> collectionSources = new ArrayList<>();
+        collectionSources.add(CollectionSource.COMPANY);
+        collectionSources.add(CollectionSource.OFFICIAL);
         List<Collection> officialCollections = collectionRepo
-                .findAllByOasisIdInAndSourceAndSaleLessThan(oasisIds, CollectionSource.COMPANY, 1);
+                .findAllByOasisIdInAndSourceInAndSaleLessThan(oasisIds, collectionSources, 1);
 
         assets.forEach(asset -> {
             OasisDistrictCollectionDTO oasisDistrictCollectionDTO = new OasisDistrictCollectionDTO();