Skip to content

Commit

Permalink
merge: 뷰 코드 초안 병합
Browse files Browse the repository at this point in the history
`dev/feat/html#83` -> `main`
다른 브랜치에서 작업하기 위해 뷰 초안 코드를 병합합니다.

See also: #83
  • Loading branch information
juwon-code authored Oct 7, 2024
2 parents 1a00771 + cee568b commit de1b382
Show file tree
Hide file tree
Showing 10 changed files with 557 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
application-dev.properties

### STS ###
.apt_generated
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.prgrms2.java.bitta.feed.exception;


import lombok.AllArgsConstructor;
import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
public class JobPostController {
private final JobPostService jobPostService;

//LIST A

//LIST B - selectbyID

//

@Operation(
summary = "전체 일거리 조회",
description = "전체 일거리를 조회합니다.",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
package com.prgrms2.java.bitta.jobpost.controller;public class JobPostViewController {
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.prgrms2.java.bitta.member.entity;


public enum Role {
USER,
Admin
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package com.prgrms2.java.bitta.scoutRequest.entity;

import com.prgrms2.java.bitta.member.entity.Member;
import com.prgrms2.java.bitta.member.exception.MemberException;
import jakarta.persistence.*;
import lombok.*;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.time.LocalDateTime;
import java.util.List;

@Entity
@AllArgsConstructor
@NoArgsConstructor
@Getter
@ToString
@Table(name = "scout_request")
@Builder
@EntityListeners(AuditingEntityListener.class)
public class ScoutRequest {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long scoutId;

@OneToMany // 아직 설정 안됨
private List<Member> director;

@OneToMany // 아직 설정 안됨
private List<Member> actor;

private String message;

@CreatedDate
private LocalDateTime createdAt;

private String Status;
// accepted denied 수락여부임 기본값 설정 필요할듯.

}













Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,9 @@ public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Excepti
.csrf(csrf -> csrf.disable())
.sessionManagement(sess -> sess.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.authorizeHttpRequests(auth -> auth
.requestMatchers(
"api/v1/members/sign-in",
"api/v1/members/sign-up",
"api/v1/members/refresh").permitAll()
.requestMatchers(
"api/members/test",
"api/v1/feed/**",
"api/v1/apply/**",
"api/v1/jobpost/**").hasRole("USER")
.requestMatchers("/members/sign-in").permitAll()
.requestMatchers("/members/sign-up").permitAll()
.requestMatchers("/members/test").hasRole("USER")
.requestMatchers("/v3/api-docs/**", "/swagger-ui.html", "/swagger-ui/**", "/webjars/**").permitAll()
.requestMatchers("/images/**").permitAll()
.anyRequest().authenticated())
Expand Down
7 changes: 0 additions & 7 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,3 @@ spring.jpa.show-sql=true
spring.jpa.properties.hibernate.format_sql=true

logging.level.org.springframework.security.web=TRACE

# File root path
file.root.path = C:\\
# File size restriction
spring.servlet.multipart.max-file-size=25MB
spring.servlet.multipart.max-request-size=50MB
Loading

0 comments on commit de1b382

Please sign in to comment.