filter valid patterns outside of the parsing logic (FT-318)

Author: Johann Egger

src/main/scala/codacy/dockerApi/DockerEngine.scala

@@ -11,7 +11,10 @@ abstract class DockerEngine(Tool: Tool) {
     spec.flatMap { implicit spec =>
       config.flatMap { case maybeConfig =>
         //search for our config
-        val maybePatterns = maybeConfig.flatMap(_.tools.collectFirst { case config if config.name == spec.name => config.patterns })
+        val maybePatterns = maybeConfig.flatMap(_.tools.collectFirst { case config if config.name == spec.name =>
+          val allPatternIds = spec.patterns.map(_.patternId)
+          config.patterns.filter{ case pattern => allPatternIds.contains(pattern.patternId) }
+        })
         val maybeFiles = maybeConfig.flatMap(_.files.map(_.map { case path =>
           sourcePath.resolve(path.value)
         }))

src/main/scala/codacy/dockerApi/package.scala

@@ -65,25 +65,25 @@ package object dockerApi {
 
   implicit def configReader(implicit spec:Spec): Reads[FullConfig] = {
     implicit val r1 = Json.reads[ParameterDef]
-    implicit val r0 = Json.reads[PatternDef].flatMap{ case pattern =>
+    implicit val r0 = Json.reads[PatternDef]/*.flatMap{ case pattern =>
 
       val filtered =
         if (spec.patterns.exists(_.patternId == pattern.patternId)) JsSuccess(pattern)
         else JsError(s"invalid patternId: ${pattern.patternId}")
 
       asReader(filtered)
-    }
+    }*/
 
     implicit val r2 = Reads.set(Json.reads[ToolConfig])
 
-    Json.reads[FullConfig].flatMap{ case fullCfg =>
+    Json.reads[FullConfig]/*.flatMap{ case fullCfg =>
       val ps = fullCfg.tools.collectFirst{ case tool if tool.name == spec.name =>
         if(tool.patterns.isEmpty) JsError("no patterns selected")
         else JsSuccess(fullCfg)
       }.getOrElse(JsError(s"no config for ${spec.name} found"))
 
       asReader(ps)
-    }
+    }*/
   }
 
   implicit lazy val writer: Writes[Result] = {