Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/gg/agit/konect/domain/user/enums/UserRole.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package gg.agit.konect.domain.user.enums;

public enum UserRole {
USER,
ADMIN
}
7 changes: 7 additions & 0 deletions src/main/java/gg/agit/konect/domain/user/model/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import gg.agit.konect.domain.university.model.University;
import gg.agit.konect.domain.user.enums.Provider;
import gg.agit.konect.domain.user.enums.UserRole;
import gg.agit.konect.global.model.BaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand Down Expand Up @@ -76,6 +77,10 @@ public class User extends BaseEntity {
@Column(name = "provider_id", length = 255)
private String providerId;

@Column(name = "role", length = 20, nullable = false)
@Enumerated(EnumType.STRING)
private UserRole role;

@Column(name = "is_marketing_agreement", nullable = false)
private Boolean isMarketingAgreement;

Expand All @@ -92,6 +97,7 @@ private User(
String studentNumber,
Provider provider,
String providerId,
UserRole role,
Boolean isMarketingAgreement,
String imageUrl
) {
Expand All @@ -103,6 +109,7 @@ private User(
this.studentNumber = studentNumber;
this.provider = provider;
this.providerId = providerId;
this.role = role == null ? UserRole.USER : role;
this.isMarketingAgreement = isMarketingAgreement;
this.imageUrl = imageUrl;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ALTER TABLE users
ADD COLUMN role VARCHAR(20) NULL AFTER provider_id;

UPDATE users
SET role = 'USER'
WHERE role IS NULL;

ALTER TABLE users
MODIFY COLUMN role VARCHAR(20) NOT NULL DEFAULT 'USER';
Loading