Skip to content

Commit c7134ce

Browse files
committed
dev: user
1 parent 8522103 commit c7134ce

7 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/main/java/com/gearfirst/user_be/common/advice/ControllerExceptionAdvice.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.gearfirst.user_be.common.advice;
22

3-
import com.gearfirst.receipt.common.exception.BaseException;
4-
import com.gearfirst.receipt.common.response.ApiResponse;
5-
import com.gearfirst.receipt.common.response.ErrorStatus;
3+
import com.gearfirst.user_be.common.exception.BaseException;
4+
import com.gearfirst.user_be.common.response.ApiResponse;
5+
import com.gearfirst.user_be.common.response.ErrorStatus;
66
import org.springframework.http.HttpStatus;
77
import org.springframework.http.ResponseEntity;
88
import org.springframework.validation.FieldError;

src/main/java/com/gearfirst/user_be/common/config/swagger/SwaggerConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class SwaggerConfig {
1212
@Bean
1313
public OpenAPI openAPI() {
1414
Server server = new Server();
15-
server.setUrl("/receipt");
15+
server.setUrl("/user");
1616

1717
return new OpenAPI()
1818
.info(new Info()

src/main/java/com/gearfirst/user_be/region/entity/RegionEntity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
@AllArgsConstructor
1414
public class RegionEntity extends BaseTimeEntity {
1515
@Id
16+
@GeneratedValue(strategy = GenerationType.IDENTITY)
1617
private Long id;
1718
private String regionName;
1819
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.gearfirst.user_be.user.dto;
22

3+
import com.gearfirst.user_be.user.enums.Rank;
34
import lombok.Data;
45

56
@Data
67
public class UserRequest {
78
private String name;
89
private String email;
910
private String phoneNum;
11+
private Rank rank;
1012
private Long regionId;
1113
private Long workTypeId;
1214
}

src/main/java/com/gearfirst/user_be/user/entity/UserEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
import lombok.*;
99

1010
@Entity
11-
@Table(name = "user")
11+
@Table(name = "users")
1212
@Data
1313
@EqualsAndHashCode(callSuper = false)
1414
@Builder
1515
@NoArgsConstructor(access = AccessLevel.PROTECTED)
1616
@AllArgsConstructor
1717
public class UserEntity extends BaseTimeEntity {
1818
@Id
19+
@GeneratedValue(strategy = GenerationType.IDENTITY)
1920
private Long id;
2021
private String name;
2122
private String phoneNum;

src/main/java/com/gearfirst/user_be/user/service/UserService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public void registUser(UserRequest userRequest) {
3737
.phoneNum(userRequest.getPhoneNum())
3838
.workType(workType)
3939
.region(region)
40+
.rank(userRequest.getRank())
4041
.build();
4142

4243
userRepository.save(user);

src/main/java/com/gearfirst/user_be/workType/entity/WorkTypeEntity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
@AllArgsConstructor
1414
public class WorkTypeEntity extends BaseTimeEntity {
1515
@Id
16+
@GeneratedValue(strategy = GenerationType.IDENTITY)
1617
private Long id;
1718
private String workTypeName;
1819
}

0 commit comments

Comments
 (0)