Optimize overview reports

Author: JohT

cypher/Overview/Effective_lines_of_method_code_per_package.cypher

@@ -8,6 +8,7 @@
       ,package.fqn                                              AS fullPackageName
       ,package.name                                             AS packageName
       ,sum(method.effectiveLineCount)                           AS sumEffectiveLinesOfMethodCode
+      ,sum(method.cyclomaticComplexity)                         AS sumCyclomaticComplexity
       ,COUNT(DISTINCT method) AS numberOfMethods
       ,reduce( // Get the max effectiveLineCount of all methods in the package with the name and type of the method
         loc = {max:-1}, // initial object with max lines of code = -1
@@ -16,7 +17,7 @@
             THEN {max: m.method.effectiveLineCount, method: m.method, type: m.type} // then update the object
             ELSE loc // otherwise keep the object as it was
           END
-        ) AS methodWithMaxLoc
+        ) AS methodWithMaxLinesOfCode
       ,reduce( // Get the max cyclomaticComplexity of all methods in the package with the name and type of the method
         cmplx = {max:-1}, // initial object with max cyclomatic complexity = -1
         m IN collect({method:method, type:type}) | // collect all methods and their types as objects
@@ -27,12 +28,13 @@
         ) AS methodWithMaxCyclomaticComplexity
 RETURN artifactName, fullPackageName
       ,sumEffectiveLinesOfMethodCode                 AS linesInPackage
+      ,sumCyclomaticComplexity                       AS complexityInPackage
       ,numberOfMethods                               AS methodCount
-      ,methodWithMaxLoc.max                          AS maxLinesMethod
-      ,methodWithMaxLoc.type.name                    AS maxLinesMethodType
-      ,methodWithMaxLoc.method.name                  AS maxLinesMethodName
+      ,methodWithMaxLinesOfCode.max                  AS maxLinesMethod
+      ,methodWithMaxLinesOfCode.type.name            AS maxLinesMethodType
+      ,methodWithMaxLinesOfCode.method.name          AS maxLinesMethodName
       ,methodWithMaxCyclomaticComplexity.max         AS maxComplexity
       ,methodWithMaxCyclomaticComplexity.type.name   AS maxComplexityType
       ,methodWithMaxCyclomaticComplexity.method.name AS maxComplexityMethod
       ,packageName 
-ORDER BY sumEffectiveLinesOfMethodCode DESC, artifactName ASC, fullPackageName
+ORDER BY linesInPackage DESC, artifactName ASC, fullPackageName

cypher/Overview/Number_of_types_per_artifact.cypher

@@ -2,11 +2,21 @@
 
  MATCH (artifact:Artifact)-[:CONTAINS]->(type:Type) 
   WITH replace(last(split(artifact.fileName, '/')), '.jar', '') AS artifactName
+      ,count(DISTINCT type.fqn) AS numberOfArtifactTypes
+      ,collect(DISTINCT type)   AS types
+UNWIND types AS type
+  WITH artifactName
+      ,numberOfArtifactTypes
       ,type
       ,labels(type) AS typeLabels
 UNWIND typeLabels AS typeLabel
-  WITH artifactName, type, typeLabel
+  WITH artifactName
+      ,numberOfArtifactTypes
+      ,type
+      ,typeLabel
  WHERE typeLabel IN ['Class', 'Interface', 'Annotation', 'Enum']
 RETURN artifactName
+      ,numberOfArtifactTypes
       ,typeLabel    AS languageElement
-      ,count(type)  AS numberOfTypes
+      ,count(type)  AS numberOfTypes
+ ORDER BY numberOfArtifactTypes DESC, artifactName ASC

cypher/Overview/Overview_size.cypher

@@ -0,0 +1,44 @@
+// Overview size
+
+ MATCH (n)
+  WITH COUNT(n) AS nodeCount
+ MATCH ()-[]->()
+  WITH nodeCount
+      ,count(*) AS relationshipCount
+ MATCH (a:Artifact:Archive)
+  WITH nodeCount
+      ,relationshipCount
+      ,count(DISTINCT a.fileName) AS artifactCount
+ MATCH (p:Package)
+  WITH nodeCount
+      ,relationshipCount
+      ,artifactCount
+      ,count(DISTINCT p.fqn) AS packageCount
+ MATCH (t:Type)
+  WITH nodeCount
+      ,relationshipCount
+      ,artifactCount
+      ,packageCount
+      ,count(DISTINCT t.fqn) AS typeCount
+ MATCH (m:Method)
+  WITH nodeCount
+      ,relationshipCount
+      ,artifactCount
+      ,packageCount
+      ,typeCount
+      ,count(DISTINCT m.signature) AS methodCount
+ MATCH (member:Member)
+  WITH nodeCount
+      ,relationshipCount
+      ,artifactCount
+      ,packageCount
+      ,typeCount
+      ,methodCount
+      ,count(DISTINCT member.signature) AS memberCount
+RETURN nodeCount
+      ,relationshipCount
+      ,artifactCount
+      ,packageCount
+      ,typeCount
+      ,methodCount
+      ,memberCount