🚧 15: Get scope name from Collection

Author: tchlyah

src/main/java/com/github/couchmove/repository/CouchbaseRepository.java

@@ -15,6 +15,8 @@
  */
 public interface CouchbaseRepository<E extends CouchbaseEntity> {
 
+    CouchbaseRepository<E> withCollection(String collection);
+
     CouchbaseRepository<E> withCollection(String scope, String collection);
 
     /**
@@ -102,6 +104,11 @@ public interface CouchbaseRepository<E extends CouchbaseEntity> {
      */
     String getBucketName();
 
+    /**
+     * @return name of the repository Couchbase {@link com.couchbase.client.java.Scope}
+     */
+    String getScopeName();
+
     /**
      * Instruct the query engine to trigger the build of indexes that have been deferred, within the default management
      */

src/main/java/com/github/couchmove/repository/CouchbaseRepositoryImpl.java

@@ -63,6 +63,7 @@ public class CouchbaseRepositoryImpl<E extends CouchbaseEntity> implements Couch
     private static final ObjectMapper jsonMapper = new ObjectMapper();
 
     public static final String BUCKET_PARAM = "bucket";
+    public static final String SCOPE_PARAM = "scope";
     public static final int MAX_ATTEMPTS = 5;
     public static final String DEFAULT = "_default";
 
@@ -114,6 +115,11 @@ public CouchbaseRepositoryImpl(Cluster cluster, Bucket bucket, Class<E> entityCl
         this.entityClass = entityClass;
     }
 
+    @Override
+    public CouchbaseRepositoryImpl<E> withCollection(String collection) {
+        return new CouchbaseRepositoryImpl<>(cluster, bucket.scope(this.collection.scopeName()).collection(collection), entityClass);
+    }
+
     @Override
     public CouchbaseRepositoryImpl<E> withCollection(String scope, String collection) {
         return new CouchbaseRepositoryImpl<>(cluster, bucket.scope(scope).collection(collection), entityClass);
@@ -228,14 +234,22 @@ public boolean isFtsIndexExists(String name) {
     }
 
     String injectParameters(String statement) {
-        return StrSubstitutor.replace(statement, of(BUCKET_PARAM, getBucketName()));
+        return StrSubstitutor.replace(statement, of(
+                BUCKET_PARAM, getBucketName(),
+                SCOPE_PARAM, getScopeName()
+        ));
     }
 
     @Override
     public String getBucketName() {
         return collection.bucketName();
     }
 
+    @Override
+    public String getScopeName() {
+        return collection.scopeName();
+    }
+
     @Override
     public void buildN1qlDeferredIndexes() {
         logger.info("Build N1QL Deferred Indexes for default");

src/main/java/com/github/couchmove/service/ChangeLogDBService.java

@@ -137,7 +137,11 @@ public void importDocuments(Collection<Document> documents) {
         for (Document document : documents) {
             var repo = repository;
             if (document.getCollection() != null) {
-                repo = repository.withCollection(document.getScope(), document.getCollection());
+                if (document.getScope() != null) {
+                    repo = repository.withCollection(document.getScope(), document.getCollection());
+                } else {
+                    repo = repository.withCollection(document.getCollection());
+                }
             }
             repo.save(FilenameUtils.getBaseName(document.getFileName()), document.getContent());
         }

src/main/java/com/github/couchmove/utils/FileUtils.java

@@ -120,6 +120,8 @@ private static Document getDocument(Path directoryPath, Path path) {
         switch (relativePath.getNameCount()) {
             case 1:
                 return new Document(null, null, fileName, content);
+            case 2:
+                return new Document(null, relativePath.getName(0).toString(), fileName, content);
             case 3:
                 return new Document(
                         relativePath.getName(0).toString(),

src/test/java/com/github/couchmove/repository/CouchbaseRepositoryIT.java

@@ -12,7 +12,6 @@
 import com.github.couchmove.pojo.Type;
 import com.github.couchmove.utils.*;
 import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -180,10 +179,10 @@ public void should_check_fts_index_not_exists(String description, CouchbaseRepos
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("repositoryParams")
-    public void should_inject_bucket_name(String description, CouchbaseRepository<ChangeLog> repository) {
-        String format = "SELECT * FROM `%s`";
-        String statement = format(format, "${bucket}");
-        assertThat(((CouchbaseRepositoryImpl) repository).injectParameters(statement)).isEqualTo(format(format, getBucket().name()));
+    public void should_inject_params(String description, CouchbaseRepository<ChangeLog> repository) {
+        String format = "SELECT * FROM `%s`.`%s`.test";
+        String statement = format(format, "${bucket}", "${scope}");
+        assertThat(((CouchbaseRepositoryImpl) repository).injectParameters(statement)).isEqualTo(format(format, getBucket().name(), repository.getScopeName()));
     }
 
     @ParameterizedTest(name = "{0}")

src/test/java/com/github/couchmove/utils/FileUtilsTest.java

@@ -98,16 +98,23 @@ public void should_read_files_in_directory() throws IOException {
         File file3 = File.createTempFile("file3", ".json", collectionDir);
         String content3 = "content3";
         Files.write(content3.getBytes(), file3);
+        // json file with collection directories
+        collectionDir = new File(tempDir, format("%s", collection));
+        collectionDir.mkdirs();
+        File file4 = File.createTempFile("file4", ".json", collectionDir);
+        String content4 = "content4";
+        Files.write(content4.getBytes(), file4);
 
         // When we read files in this directory with extension filter
         var results = FileUtils.readFilesInDirectory(tempDir.toPath(), "json", "n1ql");
 
         // Then we should have file content matching this extension
-        assertThat(results).hasSize(3);
+        assertThat(results).hasSize(4);
         assertThat(results).containsExactlyInAnyOrder(
                 new Document(null, null, file1.getName(), content1),
                 new Document(null, null, file2.getName(), content2),
-                new Document(scope, collection, file3.getName(), content3)
+                new Document(scope, collection, file3.getName(), content3),
+                new Document(null, collection, file4.getName(), content4)
         );
     }
 }