Merge branch 'main' into rename-lease

Author: md5sha256

realty-common/src/main/java/io/github/md5sha256/realty/database/entity/LeaseContractEntity.java

@@ -15,7 +15,7 @@
  * @param price                Rental price (must be > 0)
  * @param durationSeconds      Lease duration in seconds (must be > 0)
  * @param startDate            When the lease started
- * @param endDate              When the current lease period ends, or {@code null} if unknown
+ * @param endDate              When the current lease period ends, or {@code null} if no tenant
  * @param currentMaxExtensions Current extension count (nullable; must be ≤ maxExtensions when present)
  * @param maxExtensions        Maximum allowed extensions (nullable)
  * @see io.github.md5sha256.realty.api.LeaseContract

realty-common/src/main/java/io/github/md5sha256/realty/database/maria/mapper/MariaLeaseContractMapper.java

@@ -55,7 +55,7 @@ INSERT INTO LeaseContract (landlordId, tenantId, price, durationSeconds, startDa
                 #{price},
                 #{durationSeconds},
                 NOW(),
-                NOW() + INTERVAL #{durationSeconds} SECOND,
+                CASE WHEN #{tenantId} IS NOT NULL THEN NOW() + INTERVAL #{durationSeconds} SECOND ELSE NULL END,
                 CASE WHEN #{maxRenewals} >= 0 THEN 0     ELSE NULL END,
                 CASE WHEN #{maxRenewals} >= 0 THEN #{maxRenewals} ELSE NULL END
             )
@@ -166,6 +166,7 @@ AND lc.endDate < NOW()
     @Update("""
             UPDATE LeaseContract
             SET tenantId = NULL,
+                endDate = NULL,
                 currentMaxExtensions = CASE WHEN maxExtensions IS NOT NULL THEN 0 ELSE NULL END
             WHERE leaseContractId = #{leaseContractId}
             """)
@@ -203,6 +204,10 @@ int updateLandlordByRegion(@Param("worldGuardRegionId") @NotNull String worldGua
             INNER JOIN Contract c ON c.contractId = lc.leaseContractId AND c.contractType = 'contract'
             INNER JOIN RealtyRegion rr ON rr.realtyRegionId = c.realtyRegionId
             SET lc.tenantId = #{tenantId},
+                lc.endDate = CASE
+                    WHEN #{tenantId} IS NULL THEN NULL
+                    ELSE lc.endDate
+                END,
                 lc.currentMaxExtensions = CASE
                     WHEN #{tenantId} IS NULL AND lc.maxExtensions IS NOT NULL THEN 0
                     ELSE lc.currentMaxExtensions

realty-common/src/main/resources/sql/migrations/V7__lease_end_date.sql

@@ -2,7 +2,5 @@ ALTER TABLE LeaseContract
     ADD COLUMN endDate DATETIME;
 
 UPDATE LeaseContract
-SET endDate = startDate + INTERVAL durationSeconds SECOND;
-
-ALTER TABLE LeaseContract
-    MODIFY COLUMN endDate DATETIME NOT NULL;
+SET endDate = startDate + INTERVAL durationSeconds SECOND
+WHERE tenant IS NOT NULL;