Beta version (#25)

* feat: Implement saving data between program runs

* fix(RBStruct): Remove infinite loop in postorder, correct comparison in restoreStruct

* feat(neo4j): Implement saving many trees

* refactor: Rename some classes and packages

* feat: Implement checking code coverage in CI

* feat: Implement checking code coverage in CI

* fix: Deleting node with one child

* fix: Problems with Serializable connection; Refactor commonObjects package and Tree.putItem method; fix #21 - issue

fix: Problems with Serializable connection; Refactor commonObjects package and Tree.putItem method; fix #21 - issue

* feat(.json files): Implement saving many trees

* refactor: Change argument name in balance method

* refactor: Exceptions throwing - #22.

* refactor: Remove "turns" from interface Balancer.

* Feat: add tests for BINStruct, AVLTree

* feat: Implement a sketch of the application start window

* feat: Implement a name getter for all trees (BIN, RBT)

* feat: Implement saving AVLStruct in SQLite via exposed-ORM (#23).

refactor: ....

* feat: Implement TreeManager interface for interacting with controller

* refactor: Remove warnings after intellij hints

* feat: Redesign interface TreeManager; Implement AVLTreeManager

* refactor: Redesign SQLiteRepositoryExposed

* feat: Implement searching file in neo4j and json repo

* feat: Implement Controller sketch

* feat: Implement some MenuItems

* feat: Implement common methods of Managers classes

* fix: Change some input parameters

* fix: Add functionality to the menu

* fix: Completely redesigned homepage

* feat: Implement basic architecture of trees rendering without positioning; Create an implementation of BIN rendering without padding. (#24)

* feat: Implement FileDialog to select files

* refactor: architecture of database interaction with trees - rewrite logic TreeManagers (#24).

* feat: Implement a user input validator

* Implement saveDialog to save trees

* feat: Implement DeleteDialog for tree removal

* refactor: Structure files (ui)

* refactor: Rewrite architecture responsible for working with databases, interacting with data structures (TreeStructs); implement binary tree coordinates counting (#24).

* feat: Implement methods for DrawableTrees displaying - TreeDrawingUtils (#24).

* refactor: Structure files (ui)

* feat: Implement displaying of RBDrawableTree and AVLDrawableTree (#24).

* fix: Visual representation of the tree

* feat: Implement DrawTree interface (#24).

* fix: Move displayTree method inside DrawableTree (#24).

* feat: Update DrawTree interface: make name and root of a DrawableTree var instead of val; create method - split methods deleteTree and deleteTreeFromDB (#24).

* feat: Implement the integration of trees in the main interface

* fix: Remove generics from DrawTree interface (#24).

* fix: Display of the node data element

* fix: Interacting with neo4j (find)

* fix: Bugs in saving trees in databases.

* feat: Implement saving trees to the database using ui

* fix: Fix tests for trees

---------

Co-authored-by: Georgy S <[email protected]>
Co-authored-by: Aleksandr <[email protected]>

Author: 3 people

.github/workflows/CI.yml

@@ -32,3 +32,7 @@ jobs:
         with:
           generate-branches-badge: true
           jacoco-csv-file: lib/build/jacoco/report.csv
+
+      - if: ${{ github.event_name == 'pull_request' }}
+        name: Jacoco Test Coverage Verification
+        run: ./gradlew jacocoTestCoverageVerification

.gitignore

@@ -4,3 +4,6 @@
 /lib/build/
 /lib/TEST_TEST/
 /gradle/
+/neo4jDB/
+/saved-trees/
+/sqliteDB/

docker-compose.yml

@@ -0,0 +1,13 @@
+version: '3.9'
+
+services:
+  neo4j:
+    image: neo4j:latest
+    volumes:
+      - ./neo4jDB:/data
+    container_name: neo4j-db
+    ports:
+      - "7474:7474"
+      - "7687:7687"
+    environment:
+      - NEO4J_AUTH=neo4j/password

gradle.properties

@@ -1,2 +1,3 @@
 kotlinVersion=1.8.10
 sqliteJdbcVersion=3.41.2.1
+exposedVersion=0.40.1

lib/build.gradle.kts

@@ -1,11 +1,12 @@
-val sqliteJdbcVersion: String by project
 plugins {
     java
     kotlin("jvm") version "1.8.10"
     jacoco
     `java-library`
     `maven-publish`
+    kotlin("plugin.serialization") version "1.5.0"
     // checkstyle
+    id("org.jetbrains.compose") version "1.4.0"
 }
 
 java {
@@ -16,6 +17,7 @@ java {
 
 repositories {
     mavenLocal()
+    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     mavenCentral()
 }
 
@@ -31,8 +33,18 @@ dependencies {
     implementation("org.neo4j", "neo4j-ogm-bolt-driver", neo4jCore)
 
     // JDBC Sqlite
+    val sqliteJdbcVersion: String by project
     implementation("org.xerial", "sqlite-jdbc", sqliteJdbcVersion)
 
+    val exposedVersion: String by project
+    implementation("org.jetbrains.exposed:exposed-core:$exposedVersion")
+    implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion")
+    implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
+
+    implementation(kotlin("stdlib-jdk8"))
+    implementation(compose.desktop.currentOs)
+    implementation(compose.material3)
+
     testImplementation("io.mockk:mockk:1.13.4")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:1.8.10")
     testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.2")
@@ -41,6 +53,12 @@ dependencies {
 
 }
 
+compose.desktop {
+    application {
+        mainClass = "MainKt"
+    }
+}
+
 tasks.test {
     finalizedBy(tasks.jacocoTestReport)
     useJUnitPlatform()
@@ -92,7 +110,7 @@ tasks.jacocoTestReport {
 tasks.jacocoTestCoverageVerification {
     classDirectories.setFrom( classDirectories.files.flatMap { fileTree(it) {
         include("**/RBBalancer.class", "**/AVLBalancer.class", "**/BINStruct", "**/AVLStruct.class", "**/BINStruct.class")
-        exclude("**/singleObjects/**", "**/RBVertex.class", "**/AVLVertex.class", "**/BINVertex.class", "**/Vertex.class", "**/BINStruct.class", "**/AVLStruct.class", "**/RBStruct.class", "**/TreeStruct.class")
+        exclude("**/commonObjects/**", "**/RBVertex.class", "**/AVLVertex.class", "**/BINVertex.class", "**/Vertex.class", "**/BINStruct.class", "**/AVLStruct.class", "**/RBStruct.class", "**/TreeStruct.class")
     } })
     dependsOn(tasks.jacocoTestReport)
     violationRules {

lib/src/main/kotlin/controller/BINTreeManager.kt

@@ -0,0 +1,129 @@
+package controller
+
+import databaseManage.AVLTreeManager
+import databaseManage.BINTreeManager
+import databaseManage.RBTreeManager
+import treelib.commonObjects.Container
+import viewPart.nodes.drawableAVL.AVLDrawableTree
+import viewPart.nodes.drawableBIN.BINDrawableTree
+import viewPart.nodes.drawableRB.RBDrawableTree
+import viewPart.nodes.drawableTree.DrawTree
+import java.io.File
+import java.lang.Integer.min
+
+
+class Controller {
+
+    private val avlManager = AVLTreeManager()
+    private val rbManager = RBTreeManager()
+    private val binManager = BINTreeManager()
+
+
+    var tree: DrawTree? = null
+
+    fun showFiles(): List<List<String>> {
+        val avlTrees = avlManager.getSavedTreesNames()
+        val rbTrees = rbManager.getSavedTreesNames()
+
+        createDummyFiles(avlTrees, rbTrees)
+
+        return listOf(
+            rbTrees.subList(0, min(3, rbTrees.size)),
+            avlTrees.subList(0, min(3, avlTrees.size)),
+            binManager.getSavedTreesNames()
+        )
+    }
+
+    private fun createDummyFiles(avlTrees: List<String>, rbTrees: List<String>) {
+        val avlPath = System.getProperty("user.dir") + "/saved-trees/AVL-trees"
+        val rbPath = System.getProperty("user.dir") + "/saved-trees/RB-trees"
+
+        File(avlPath).mkdirs()
+        File(rbPath).mkdirs()
+
+        if (avlTrees.isNotEmpty()) {
+            for (name in avlTrees) {
+                File(avlPath, name).run {
+                    createNewFile()
+                }
+            }
+        }
+
+        if (rbTrees.isNotEmpty()) {
+            for (name in rbTrees) {
+                File(rbPath, name).run {
+                    createNewFile()
+                }
+            }
+        }
+
+    }
+
+    fun createTree(treeName: String, id: Int): DrawTree {
+        when (id) {
+            0 -> tree = RBDrawableTree(treeName, rbManager)
+            1 -> tree = AVLDrawableTree(treeName, avlManager)
+            2 -> tree = BINDrawableTree(treeName, binManager)
+        }
+
+        tree?.initTree()
+
+        return tree ?: throw NullPointerException()
+    }
+
+    fun insert(value: String): DrawTree {
+        val key = if (isInt(value.trim())) value.toInt() else value.hashCode()
+
+        tree?.insert(Container(Pair(key, value))) ?: throw NullPointerException()
+        tree?.updateTree() ?: throw NullPointerException()
+        tree?.repositisonTree(800f, 10f) ?: throw NullPointerException()
+
+        return tree ?: throw NullPointerException()
+    }
+
+    fun find(value: String): DrawTree {
+        val key = if (isInt(value.trim())) value.toInt() else value.hashCode()
+
+        tree?.find(key) ?: throw NullPointerException()
+
+        return tree ?: throw NullPointerException()
+
+    }
+
+    fun delete(value: String): DrawTree {
+        val key = if (isInt(value.trim())) value.toInt() else value.hashCode()
+
+        tree?.delete(Container(Pair(key, ""))) ?: throw NullPointerException()
+        tree?.updateTree() ?: throw NullPointerException()
+        tree?.repositisonTree(800f, 10f) ?: throw NullPointerException()
+
+        return tree ?: throw NullPointerException()
+    }
+
+
+    private fun isInt(value: String): Boolean {
+        return try {
+            Integer.parseInt(value.trim())
+            true
+        } catch (ex: NumberFormatException) {
+            false
+        }
+    }
+
+    fun deleteTree(): DrawTree {
+        tree?.deleteTree()
+        return tree ?: throw Exception("Tree not initialized")
+    }
+
+    fun saveTree(fileName: String) {
+        if (tree == null)
+            throw Exception("Tree not initialized")
+
+        tree?.name = fileName
+        tree?.saveTreeToDB() ?: throw Exception()
+
+    }
+
+
+}
+