androidlover5842/TrisolarisServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove org model; make AppUser global with super admin
All checks were successful
build-and-deploy / build-deploy (push) Successful in 27s
Details

Browse Source
This commit is contained in:
androidlover5842
2026-01-26 22:33:59 +05:30
parent bf87d329d4
commit 1400451bfe
26 changed files with 101 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/com/android/trisolarisserver/models/booking/Guest.kt
View File

@@ -1,6 +1,6 @@
package com.android.trisolarisserver.models.booking
import com.android.trisolarisserver.models.property.Organization
import com.android.trisolarisserver.models.property.Property
import jakarta.persistence.*
import java.time.OffsetDateTime
import java.util.UUID
@@ -8,7 +8,7 @@ import java.util.UUID
@Entity
@Table(
name = "guest",
uniqueConstraints = [UniqueConstraint(columnNames = ["org_id", "phone_e164"])]
uniqueConstraints = [UniqueConstraint(columnNames = ["property_id", "phone_e164"])]
)
class Guest(
@Id
@@ -17,8 +17,8 @@ class Guest(
val id: UUID? = null,
@ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn(name = "org_id", nullable = false)
var org: Organization,
@JoinColumn(name = "property_id", nullable = false)
var property: Property,
@Column(name = "phone_e164")
var phoneE164: String? = null,

5
src/main/kotlin/com/android/trisolarisserver/models/booking/GuestRating.kt
View File

@@ -1,7 +1,6 @@
package com.android.trisolarisserver.models.booking
import com.android.trisolarisserver.models.property.AppUser
import com.android.trisolarisserver.models.property.Organization
import com.android.trisolarisserver.models.property.Property
import jakarta.persistence.Column
import jakarta.persistence.Entity
@@ -30,10 +29,6 @@ class GuestRating(
@Column(columnDefinition = "uuid")
val id: UUID? = null,
@ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn(name = "org_id", nullable = false)
var org: Organization,
@ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn(name = "property_id", nullable = false)
var property: Property,

8
src/main/kotlin/com/android/trisolarisserver/models/booking/GuestVehicle.kt
View File

@@ -1,6 +1,6 @@
package com.android.trisolarisserver.models.booking
import com.android.trisolarisserver.models.property.Organization
import com.android.trisolarisserver.models.property.Property
import jakarta.persistence.*
import java.time.OffsetDateTime
import java.util.UUID
@@ -8,7 +8,7 @@ import java.util.UUID
@Entity
@Table(
name = "guest_vehicle",
uniqueConstraints = [UniqueConstraint(columnNames = ["org_id", "vehicle_number"])]
uniqueConstraints = [UniqueConstraint(columnNames = ["property_id", "vehicle_number"])]
)
class GuestVehicle(
@Id
@@ -17,8 +17,8 @@ class GuestVehicle(
val id: UUID? = null,
@ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn(name = "org_id", nullable = false)
var org: Organization,
@JoinColumn(name = "property_id", nullable = false)
var property: Property,
@ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn(name = "guest_id", nullable = false)