gridfs specs added

Author: sfxcode

src/main/scala/com/sfxcode/nosql/mongo/GridFSDAO.scala

@@ -3,9 +3,9 @@ package com.sfxcode.nosql.mongo
 import com.sfxcode.nosql.mongo.gridfs.Crud
 import org.bson.types.ObjectId
 import org.mongodb.scala.bson.conversions.Bson
-import org.mongodb.scala.gridfs.{GridFSBucket, GridFSFile}
+import org.mongodb.scala.gridfs.{ GridFSBucket, GridFSFile }
 import org.mongodb.scala.model.CountOptions
-import org.mongodb.scala.{Completed, Document, MongoDatabase, Observable, ReadConcern, ReadPreference, SingleObservable, WriteConcern}
+import org.mongodb.scala.{ Completed, Document, MongoDatabase, Observable, ReadConcern, ReadPreference, SingleObservable, WriteConcern }
 
 abstract class GridFSDAO(database: MongoDatabase, bucketName: String) extends Crud {
 
@@ -19,6 +19,8 @@ abstract class GridFSDAO(database: MongoDatabase, bucketName: String) extends Cr
 
   def createrMetadataIndex(key: String, sortAscending: Boolean = true): SingleObservable[String] = Files.createIndexForField(createMetadataKey(key), sortAscending)
 
+  def dropIndexForName(name: String): Completed = Files.dropIndexForName(name)
+
   def renameFile(id: ObjectId, newFilename: String): Observable[Completed] = gridfsBucket.rename(id, newFilename)
 
   def renameFile(file: GridFSFile, newFilename: String): Observable[Completed] = gridfsBucket.rename(file.getId, newFilename)

src/main/scala/com/sfxcode/nosql/mongo/gridfs/Base.scala

@@ -1,19 +1,19 @@
 package com.sfxcode.nosql.mongo.gridfs
 
 import java.nio.channels.AsynchronousFileChannel
-import java.nio.file.{OpenOption, Path, StandardOpenOption}
+import java.nio.file.{ OpenOption, Path, StandardOpenOption }
 
 import com.typesafe.scalalogging.LazyLogging
 import org.mongodb.scala.bson.ObjectId
 import org.mongodb.scala.gridfs.GridFSBucket
 import org.mongodb.scala.gridfs.helpers.AsynchronousChannelHelper.channelToOutputStream
-import org.mongodb.scala.{Completed, Observable, ReadConcern, ReadPreference, WriteConcern}
+import org.mongodb.scala.{ Completed, Observable, ReadConcern, ReadPreference, WriteConcern }
 
 abstract class Base extends LazyLogging {
 
   protected def gridfsBucket: GridFSBucket
 
-  def createMetadataKey(key:String):String = {
+  def createMetadataKey(key: String): String = {
     var metadataKey = key
     if (!metadataKey.startsWith("metadata"))
       metadataKey = "%s.%s".format("metadata", key)

src/main/scala/com/sfxcode/nosql/mongo/gridfs/Crud.scala

@@ -7,7 +7,7 @@ import com.sfxcode.nosql.mongo.Converter
 import org.bson.types.ObjectId
 import org.mongodb.scala.gridfs.AsyncInputStream
 import org.mongodb.scala.gridfs.helpers.AsyncStreamHelper.toAsyncInputStream
-import org.mongodb.scala.{Completed, Document, Observable}
+import org.mongodb.scala.{ Completed, Document, Observable }
 
 abstract class Crud extends Search {
 

src/main/scala/com/sfxcode/nosql/mongo/gridfs/Search.scala

@@ -14,9 +14,7 @@ abstract class Search extends Base {
 
   def find(key: String, value: Any): GridFSFindObservable = find(equal(key, value))
 
-  def findByMetadataValue(key: String, value: Any): GridFSFindObservable =  find(createMetadataKey(key), value)
-
-
+  def findByMetadataValue(key: String, value: Any): GridFSFindObservable = find(createMetadataKey(key), value)
 
 }
 

src/main/scala/com/sfxcode/nosql/mongo/operation/ObservableIncludes.scala

@@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit
 import org.mongodb.scala._
 
 import scala.concurrent.duration.Duration
-import scala.concurrent.{Await, Future}
+import scala.concurrent.{ Await, Future }
 
 object ObservableIncludes extends ObservableIncludes
 

src/main/scala/com/sfxcode/nosql/mongo/package.scala

@@ -6,8 +6,8 @@ import com.sfxcode.nosql.mongo.operation.ObservableIncludes
 import org.bson.BsonValue
 import org.bson.types.ObjectId
 import org.mongodb.scala.bson.conversions.Bson
-import org.mongodb.scala.gridfs.{GridFSFile, GridFSFindObservable}
-import org.mongodb.scala.{Document, FindObservable, MongoDatabase, Observable}
+import org.mongodb.scala.gridfs.{ GridFSFile, GridFSFindObservable }
+import org.mongodb.scala.{ Document, FindObservable, MongoDatabase, Observable }
 
 import scala.collection.JavaConverters._
 import scala.language.implicitConversions
@@ -32,7 +32,6 @@ package object mongo extends ObservableIncludes {
     documentFromScalaMap(map.toMap)
   }
 
-
   implicit def documentFromScalaMap(map: Map[String, Any]): Document = {
     var result = Document()
     map.keys.foreach(key => {

src/test/scala/com/sfxcode/nosql/mongo/gridfs/GridFSDatabaseSpec.scala

@@ -0,0 +1,52 @@
+package com.sfxcode.nosql.mongo.gridfs
+
+import better.files.File
+import com.sfxcode.nosql.mongo.gridfs.GridfsDatabase._
+import org.bson.types.ObjectId
+import org.specs2.mutable.Specification
+import org.specs2.specification.BeforeAll
+
+class GridFSDatabaseSpec extends Specification with GridfsDatabaseFunctions with BeforeAll {
+
+  "GridFSDatabase" should {
+
+    "find file in" in {
+      val fileName = "scala-logo.jpg"
+
+      val file = findImage("filename", fileName)
+      file.getFilename must be equalTo fileName
+
+    }
+
+    "find files by metadata valuein" in {
+      val fileName = "scala-logo.jpg"
+
+      var files = findImages("group", "unknown")
+      files must haveSize(0)
+
+      files = findImages("group", "templates")
+      files must haveSize(1)
+    }
+
+    "insert file in" in {
+      val fileName = "scala-logo.png"
+
+      val oid: ObjectId = insertImage(SourcePath + fileName, ImageMetadata("template1", group = "templates"))
+
+      val file = findImage(oid)
+      file.getFilename must be equalTo fileName
+
+    }
+
+  }
+
+  override def beforeAll(): Unit = {
+    dropImages
+    insertImage(SourcePath + "scala-logo.jpg", ImageMetadata("logo2", indexSet = Set(5, 6, 7)))
+    imagesCount must be equalTo 1
+
+    val file = File(TargetPath)
+    if (!file.exists)
+      file.createDirectory()
+  }
+}

src/test/scala/com/sfxcode/nosql/mongo/gridfs/GridfsDatabase.scala

@@ -7,6 +7,10 @@ import com.sfxcode.nosql.mongo.database.DatabaseProvider
  * GridFS Database Sample
  */
 object GridfsDatabase {
+  val SourcePath = "src/test/resources/images/"
+  val TargetPath = "/tmp/_files/"
+
+  case class ImageMetadata(name: String, group: String = "logos", version: Int = 1, indexSet: Set[Int] = Set(1, 2, 3))
 
   val database = DatabaseProvider("test")
 

src/test/scala/com/sfxcode/nosql/mongo/gridfs/GridfsDatabaseApp.scala

@@ -2,14 +2,10 @@ package com.sfxcode.nosql.mongo.gridfs
 
 import com.sfxcode.nosql.mongo._
 import org.bson.types.ObjectId
+import com.sfxcode.nosql.mongo.gridfs.GridfsDatabase._
 
 object GridfsDatabaseApp extends App with GridfsDatabaseFunctions {
 
-  val SourcePath = "src/test/resources/images/"
-  val TargetPath = "/tmp/"
-
-  case class ImageMetadata(name:String, group:String="logos", version:Int =1, indexSet:Set[Int] = Set(1,2,3))
-
   dropImages
 
   println(imagesCount)
@@ -21,17 +17,19 @@ object GridfsDatabaseApp extends App with GridfsDatabaseFunctions {
 
   val file = findImage(id.toString)
   println(file)
-  val file2 = findImage(file)
-  println(file2)
 
-  downloadImage(file2,TargetPath + file.getFilename)
+  val imageFile = findImage(file)
+
+  println(imageFile.getChunkSize)
+  println(imageFile.getMetadata.get("indexSet"))
 
-  insertImage(SourcePath + "scala-logo.jpg", ImageMetadata("logo1", indexSet = Set(5,6,7)))
+  downloadImage(imageFile, TargetPath + file.getFilename)
+
+  insertImage(SourcePath + "scala-logo.jpg", ImageMetadata("logo2", indexSet = Set(5, 6, 7)))
   println(imagesCount)
 
   val logos = findImages("group", "logos")
 
   println(logos)
 
-
 }

src/test/scala/com/sfxcode/nosql/mongo/gridfs/GridfsDatabaseFunctions.scala

@@ -9,9 +9,12 @@ import org.mongodb.scala.gridfs.GridFSFile
 
 trait GridfsDatabaseFunctions {
 
-  def createIndexOnImages(key:String): String =
+  def createIndexOnImages(key: String): String =
     ImageFilesDAO.createrMetadataIndex(key)
 
+  def dropIndexOnImages(key: String): Completed =
+    ImageFilesDAO.dropIndexForName(key)
+
   def deleteImage(id: ObjectId): Completed =
     ImageFilesDAO.deleteOne(id)
 
@@ -30,6 +33,8 @@ trait GridfsDatabaseFunctions {
 
   def findImage(id: ObjectId): GridFSFile = ImageFilesDAO.findById(id)
 
-  def findImages(key:String, value:String): List[GridFSFile] = ImageFilesDAO.findByMetadataValue(key, value)
+  def findImage(key: String, value: String): GridFSFile = ImageFilesDAO.find(key, value)
+
+  def findImages(key: String, value: String): List[GridFSFile] = ImageFilesDAO.findByMetadataValue(key, value)
 
 }