feat: view 완료항목 게시

1. 컨트롤러 뷰는 버그로 뺌 2. 타임리프 엔티티 수정중
prgrms-be-devcourse · Oct 7, 2024 · cee568b · cee568b
1 parent 293f2fa
commit cee568b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 32 deletions.
diff --git a/src/main/java/com/prgrms2/java/bitta/feed/exception/FeedTaskException.java b/src/main/java/com/prgrms2/java/bitta/feed/exception/FeedTaskException.java
@@ -1,9 +1,5 @@
-<<<<<<<< HEAD:src/main/java/com/prgrms2/java/bitta/user/exception/UserTaskException.java
-package com.prgrms2.java.bitta.user.exception;
-
-========
 package com.prgrms2.java.bitta.feed.exception;
->>>>>>>> refs/remotes/origin/main:src/main/java/com/prgrms2/java/bitta/feed/exception/FeedTaskException.java
+
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

diff --git a/src/main/java/com/prgrms2/java/bitta/jobpost/controller/JobPostController.java b/src/main/java/com/prgrms2/java/bitta/jobpost/controller/JobPostController.java
@@ -29,6 +29,12 @@
 public class JobPostController {
     private final JobPostService jobPostService;
 
+    //LIST A
+
+    //LIST B - selectbyID
+
+    //
+
     @Operation(
             summary = "전체 일거리 조회",
             description = "전체 일거리를 조회합니다.",

diff --git a/src/main/java/com/prgrms2/java/bitta/member/controller/advice/TokenControllerAdvice.java b/src/main/java/com/prgrms2/java/bitta/member/controller/advice/TokenControllerAdvice.java
@@ -1,12 +1,6 @@
-<<<<<<<< HEAD:src/main/java/com/prgrms2/java/bitta/user/controller/advice/TokenControllerAdvice.java
-package com.prgrms2.java.bitta.user.controller.advice;
-
-import com.prgrms2.java.bitta.user.exception.UserTaskException;
-========
 package com.prgrms2.java.bitta.member.controller.advice;
 
 import com.prgrms2.java.bitta.member.exception.MemberTaskException;
->>>>>>>> refs/remotes/origin/main:src/main/java/com/prgrms2/java/bitta/member/controller/advice/TokenControllerAdvice.java
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authorization.AuthorizationDeniedException;

diff --git a/src/main/java/com/prgrms2/java/bitta/member/entity/Role.java b/src/main/java/com/prgrms2/java/bitta/member/entity/Role.java
@@ -1,8 +1,5 @@
-<<<<<<<< HEAD:src/main/java/com/prgrms2/java/bitta/user/entity/Role.java
-package com.prgrms2.java.bitta.user.entity;
-========
 package com.prgrms2.java.bitta.member.entity;
->>>>>>>> refs/remotes/origin/main:src/main/java/com/prgrms2/java/bitta/member/entity/Role.java
+
 
 public enum Role {
     USER,

diff --git a/src/main/java/com/prgrms2/java/bitta/scoutRequest/entity/ScoutRequest.java b/src/main/java/com/prgrms2/java/bitta/scoutRequest/entity/ScoutRequest.java
@@ -1,6 +1,7 @@
 package com.prgrms2.java.bitta.scoutRequest.entity;
 
-import com.prgrms2.java.bitta.user.entity.User;
+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;
@@ -23,10 +24,10 @@ public class ScoutRequest {
     private Long scoutId;
 
     @OneToMany // 아직 설정 안됨
-    private List<User> director;
+    private List<Member> director;
 
     @OneToMany // 아직 설정 안됨
-    private List<User> actor;
+    private List<Member> actor;
 
     private String message;
 

diff --git a/src/main/java/com/prgrms2/java/bitta/security/SecurityConfig.java b/src/main/java/com/prgrms2/java/bitta/security/SecurityConfig.java
@@ -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())

diff --git a/src/main/resources/templates/jobpost.html b/src/main/resources/templates/jobpost.html
@@ -51,16 +51,16 @@
       <div class="inner">
         <div class="contents">
           <div class="dummy-height"></div>
-          <div class="dill-box-type">
+          <div class="dill-box-type" th:each="i : ${jobPost}">
             <div class="dill-box-warp">
               <div class="top-cont">
                 <div class="main-ctext">
-                  <div class="camera-category">📷</div>
-                  <div class="post-title">| 숲 속 안에서</div>
-                  <span class="post-explane">숲에서 자연친화적 컨셉의 스틸 촬영하실 분 구합니다!!</span>
+                  <div class="camera-category" th:text="${i.cate}">📷</div>
+                  <div class="post-title" th:text="${i.title}">| 숲 속 안에서</div>
+                  <span class="post-explane" th:text="${i.sub_title}">숲에서 자연친화적 컨셉의 스틸 촬영하실 분 구합니다!!</span>
                 </div>
                 <div class="img-area">
-                  <img src="img/herin.png">
+                  <img src="img/herin.png" th:src="${i.img_url}">
                 </div>
               </div>
               <ul class="dill-list-box">