Merge pull request #1 from MathisBurger/dev-v1.1

Release v1.1

.github/workflows/pr.yml

@@ -0,0 +1,74 @@
+name: Pull Request
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Setup node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 20
+      - name: Install web dependencies
+        run: |
+          cd web
+          npm ci
+      - name: Lint
+        run: |
+          cd web
+          npm run lint
+  build:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres
+        # Provide the password for postgres
+        env:
+          POSTGRES_PASSWORD: mysecretpassword
+          POSTGRES_DB: immowealth
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps tcp port 5432 on service container to the host
+          - 5432:5432
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'gradle'
+      - name: Build with Gradle
+        run: ./gradlew build -Dquarkus.package.type=uber-jar
+      - name: Start application
+        run: |
+          nohup ./gradlew --console=plain quarkusDev &
+          for attempt in {1..20}; do sleep 1; if curl http://localhost:8080/; then echo ready; break; fi; echo waiting...; done
+      - name: Generate schema
+        run: curl http://localhost:8080/graphql/schema.graphql >> web/schema.graphql
+      - name: Update schema
+        run: |
+          echo "scalar Date" >> web/schema.graphql 
+          echo "scalar BigInteger" >> web/schema.graphql 
+          echo "scalar DateTime" >> web/schema.graphql
+      - name: Setup node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 20
+      - name: Build web
+        run: |
+          cd web
+          npm ci
+          npm run compile
+          npm run build

README.md

@@ -36,14 +36,6 @@ docker-compose up -d
 
 There are many new features planned. You can find a little roadmap of planned future releases here:
 
-### v1.1.0
-- [ ] Add extra information to objects
-- [ ] More entities should be editable
-- [ ] Update geo location by hand
-- [ ] Split large numbers with dots
-- [ ] Add credit rate note
-- [ ] Migrate all tables to MUI datagrid
-
 ### v1.2.0
 - [ ] Add translations
 - [ ] Add different currencies

src/main/kotlin/de/mathisburger/data/input/CreditRateInput.kt

@@ -21,5 +21,9 @@ data class CreditRateInput @JsonbCreator constructor(
     /**
      * The date of the booking
      */
-    val date: Date
+    val date: Date,
+    /**
+     * The note of the booking
+     */
+    val note: String?
 )

src/main/kotlin/de/mathisburger/data/input/RealEstateInput.kt

@@ -34,5 +34,50 @@ data class RealEstateInput @JsonbCreator constructor(
      * Date the real estate was bought
      */
     @AdaptToScalar(Scalar.Date::class)
-    val dateBought: Date
+    val dateBought: Date,
+    /**
+     * Amount of rooms
+     */
+    val rooms: Double,
+    /**
+     * Space for living
+     */
+    val space: Double,
+    /**
+     * Type of the object
+     * e.g. house or flat (1. OG, EG)
+     */
+    val objectType: String,
+    /**
+     * Construction year
+     */
+    val constructionYear: Int,
+    /**
+     * Renovation year
+     */
+    val renovationYear: Int?,
+    /**
+     * Energy efficiency class
+     */
+    val energyEfficiency: String?,
+    /**
+     * Gross return of the object investment
+     */
+    val grossReturn: Double?,
+    /**
+     * Garden exists
+     */
+    val garden: Boolean,
+    /**
+     * Kitchen exists
+     */
+    val kitchen: Boolean,
+    /**
+     * Heating type (wood, oil, gas)
+     */
+    val heatingType: String,
+    /**
+     * Notes
+     */
+    val notes: String?
 )

src/main/kotlin/de/mathisburger/data/input/UpdateCreditInput.kt

@@ -0,0 +1,29 @@
+package de.mathisburger.data.input
+
+import jakarta.json.bind.annotation.JsonbCreator
+
+/**
+ * The update credit input for creating credits
+ */
+data class UpdateCreditInput @JsonbCreator constructor(
+    /**
+     * The ID of the credit that should be updated
+     */
+    var id: Long,
+    /**
+     * The credit amount
+     */
+    val amount: Long?,
+    /**
+     * The interest rate
+     */
+    val interestRate: Double?,
+    /**
+     * The redemption rate
+     */
+    val redemptionRate: Double?,
+    /**
+     * The credit bank
+     */
+    val bank: String?
+)

src/main/kotlin/de/mathisburger/data/input/UpdateHousePriceChangeInput.kt

@@ -0,0 +1,25 @@
+package de.mathisburger.data.input
+
+import jakarta.json.bind.annotation.JsonbCreator
+
+/**
+ * Update house prices input
+ */
+data class UpdateHousePriceChangeInput @JsonbCreator constructor(
+    /**
+     * The ID of the entity
+     */
+    val id: Long,
+    /**
+     * The zip
+     */
+    val zip: String?,
+    /**
+     * The year
+     */
+    val year: Int?,
+    /**
+     * The change
+     */
+    val change: Double?,
+)

src/main/kotlin/de/mathisburger/data/input/UpdateRealEstateInput.kt

@@ -33,5 +33,58 @@ data class UpdateRealEstateInput @JsonbCreator constructor(
      * Date the real estate was bought
      */
     @AdaptToScalar(Scalar.Date::class)
-    val dateBought: Date?
+    val dateBought: Date?,
+    /**
+     * Position lat
+     */
+    val positionLat: Double?,
+    /**
+     * Position lon
+     */
+    val positionLon: Double?,
+    /**
+     * Amount of rooms
+     */
+    val rooms: Double?,
+    /**
+     * Space for living
+     */
+    val space: Double?,
+    /**
+     * Type of the object
+     * e.g. house or flat (1. OG, EG)
+     */
+    val objectType: String?,
+    /**
+     * Construction year
+     */
+    val constructionYear: Int?,
+    /**
+     * Renovation year
+     */
+    val renovationYear: Int?,
+    /**
+     * Energy efficiency class
+     */
+    val energyEfficiency: String?,
+    /**
+     * Gross return of the object investment
+     */
+    val grossReturn: Double?,
+    /**
+     * Garden exists
+     */
+    val garden: Boolean?,
+    /**
+     * Kitchen exists
+     */
+    val kitchen: Boolean?,
+    /**
+     * Heating type (wood, oil, gas)
+     */
+    val heatingType: String?,
+    /**
+     * General notes
+     */
+    val notes: String?
 )

src/main/kotlin/de/mathisburger/data/response/CreditResponse.kt

@@ -18,5 +18,9 @@ data class CreditResponse @JsonbCreator constructor(
     /**
      * The credit rate accumulation steps
      */
-    val creditRateCummulationSteps: List<Double>
+    val creditRateCummulationSteps: List<Double>,
+    /**
+     * Linked real estate object id
+     */
+    val realEstateObjectId: Long
 );

src/main/kotlin/de/mathisburger/data/response/MapResponse.kt

@@ -0,0 +1,22 @@
+package de.mathisburger.data.response
+
+import de.mathisburger.entity.RealEstateObject
+import jakarta.json.bind.annotation.JsonbCreator
+
+/**
+ * Map response
+ */
+data class MapResponse @JsonbCreator constructor(
+    /**
+     * All objects that should be shown on map
+     */
+    val objects: List<RealEstateObject>,
+    /**
+     * Middle lat of the map
+     */
+    val lat: Double,
+    /**
+     * Middle lon of the map
+     */
+    val lon: Double
+)

src/main/kotlin/de/mathisburger/entity/Credit.kt

@@ -5,6 +5,7 @@ import jakarta.persistence.Entity
 import jakarta.persistence.GeneratedValue
 import jakarta.persistence.Id
 import jakarta.persistence.OneToMany
+import jakarta.persistence.OneToOne
 import java.util.Date
 
 /**

src/main/kotlin/de/mathisburger/entity/CreditRate.kt

@@ -27,4 +27,9 @@ class CreditRate {
      * The amount of money
      */
     var amount: Double? = null;
+
+    /**
+     * The note of the credit rate
+     */
+    var note: String? = null;
 }

src/main/kotlin/de/mathisburger/entity/RealEstateObject.kt

@@ -51,9 +51,65 @@ class RealEstateObject {
      */
     var positionLon: Double? = null
 
+    /**
+     * Amount of rooms
+     */
+    var rooms: Double? = null
+
+    /**
+     * Space for living
+     */
+    var space: Double? = null
+
+    /**
+     * Type of the object
+     * e.g. house or flat (1. OG, EG)
+     */
+    var objectType: String? = null
+
+    /**
+     * Construction year
+     */
+    var constructionYear: Int? = null
+
+    /**
+     * Renovation year
+     */
+    var renovationYear: Int? = null
+
+    /**
+     * Energy efficiency class
+     */
+    var energyEfficiency: String? = null
+
+    /**
+     * Gross return of the object investment
+     */
+    var grossReturn: Double? = null
+
+    /**
+     * Garden exists
+     */
+    var garden: Boolean? = null
+
+    /**
+     * Kitchen exists
+     */
+    var kitchen: Boolean? = null
+
+    /**
+     * Heating type (wood, oil, gas)
+     */
+    var heatingType: String? = null
+
+    /**
+     * All multiline notes of the
+     */
+    var notes: String? = null;
+
     /**
      * The linked credit
      */
-    @OneToOne
+    @OneToOne(cascade = [CascadeType.ALL])
     var credit: Credit? = null
 }