Commit 3c50d2a0 authored by Ghitha Dinan's avatar Ghitha Dinan

token interceptor fixing

parent abb4ad3a
...@@ -18,20 +18,6 @@ data class Role( ...@@ -18,20 +18,6 @@ data class Role(
@field:NotEmpty(message = "Nama $VALIDATOR_MSG_REQUIRED") @field:NotEmpty(message = "Nama $VALIDATOR_MSG_REQUIRED")
var name: String? = null, var name: String? = null,
@Column(name = "province_id")
var provinceId: String? = null,
@ManyToOne
@JoinColumn(name = "province_id", insertable = false, updatable = false, nullable = true)
var province: Province? = null,
@Column(name = "regency_id")
var regencyId: String? = null,
@ManyToOne
@JoinColumn(name = "regency_id", insertable = false, updatable = false, nullable = true)
var regency: Regency? = null,
@Column(name = "created_at") @Column(name = "created_at")
@get:JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd-MM-yyyy HH:mm:ss", timezone = "GMT+7") @get:JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "dd-MM-yyyy HH:mm:ss", timezone = "GMT+7")
var createdAt: Date? = Date(), var createdAt: Date? = Date(),
......
...@@ -38,6 +38,20 @@ data class Users( ...@@ -38,6 +38,20 @@ data class Users(
@JoinColumn(name = "role_id", insertable = false, updatable = false, nullable = true) @JoinColumn(name = "role_id", insertable = false, updatable = false, nullable = true)
var role: Role? = null, var role: Role? = null,
@Column(name = "province_id")
var provinceId: String? = null,
@ManyToOne(optional = true, fetch = FetchType.LAZY)
@JoinColumn(name = "province_id", insertable = false, updatable = false, nullable = true)
var province: Province? = null,
@Column(name = "regency_id")
var regencyId: String? = null,
@ManyToOne(optional = true, fetch = FetchType.LAZY)
@JoinColumn(name = "regency_id", insertable = false, updatable = false, nullable = true)
var regency: Regency? = null,
@Column(name = "confirmed") @Column(name = "confirmed")
@JsonIgnore @JsonIgnore
var confirmed: Boolean? = false, var confirmed: Boolean? = false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment