Skip to content
This repository was archived by the owner on Mar 10, 2022. It is now read-only.

Commit e678f36

Browse files
Minor improvements to the user entity
Signed-off-by: JannikEmmerich <mail@jannik-emmerich.de>
1 parent f0c8aa0 commit e678f36

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

java-data/src/main/java/net/cryptic_game/backend/data/sql/entities/user/User.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import lombok.NoArgsConstructor;
77
import lombok.Setter;
88
import net.cryptic_game.backend.base.json.JsonBuilder;
9-
import net.cryptic_game.backend.base.json.JsonTransient;
109
import net.cryptic_game.backend.data.Constants;
1110
import net.getnova.framework.jpa.model.TableModelAutoId;
1211

@@ -39,15 +38,15 @@ public final class User extends TableModelAutoId {
3938
@Column(name = "last", updatable = true, nullable = false)
4039
private OffsetDateTime last;
4140

42-
@JsonTransient
43-
@Column(name = "new_user", updatable = true, nullable = false)
44-
private boolean newUser;
45-
4641
public JsonObject serializePublic() {
4742
return JsonBuilder.create("id", this.getId())
4843
.add("username", this.getUsername())
4944
.add("created", this.getCreated())
5045
.build();
5146
}
47+
48+
public boolean isNewUser() {
49+
return this.username == null;
50+
}
5251
}
5352

server/src/main/java/net/cryptic_game/backend/server/server/http/HttpOauth2Endpoints.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public Mono<ApiResponse> callback(@ApiParameter(id = "provider") final String pr
8383
user = new User();
8484
user.setCreated(now);
8585
user.setLast(now);
86-
user.setNewUser(true);
8786
final UserOAuth2ProviderId oauth2ProviderUserId = new UserOAuth2ProviderId();
8887
oauth2ProviderUserId.setUser(this.userRepository.save(user));
8988
oauth2ProviderUserId.setProviderUserId(new UserOAuth2ProviderId.ProviderUserId(userId, provider));

server/src/main/java/net/cryptic_game/backend/server/server/http/HttpUserEndpoints.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ public ApiResponse register(@ApiParameter(id = "access_token") final String acce
111111
}
112112

113113
user.setUsername(username);
114-
user.setNewUser(false);
115114

116115
return new ApiResponse(HttpResponseStatus.OK, JsonBuilder.create("user", this.userRepository.save(user)));
117116
}

0 commit comments

Comments
 (0)