Feat : 첫 화면인기 마감임박 보여주기 구현 #40

SonMyeongJin · 2024-08-01T09:01:17Z

요약 (Summary)

홈화면에 나오는 인기크루 , 마감임박 소셜링 구현했습니다.
인기크루는 crew가 참조하고있는 member_crew가 많은 순으로 상위 4개를 반환합니다.
마감임박 소셜링은 socialring_date가 임박한 상위 4개를 반환합니다.
해더에 auth가 필요합니다.

🔑 변경 사항 (Key Changes)

📝 리뷰 요구사항 (To Reviewers)

DB에 샘플 정보들을 입력합니다

USE likelion12;

-- Insert random data into the facility table
INSERT INTO facility (
    created_at, modified_at, weekday, weekend, administer, facility_address, facility_name, facility_phone, facility_size, status
) VALUES
('2024-08-01 08:00:00', '2024-08-01 08:00:00', '2024-08-01 09:00:00', '2024-08-02 09:00:00', 'John Doe', '123 Elm Street, North Town', 'Central Gym', '123-456-7890', 'Large', 'ACTIVE'),
('2024-08-02 09:00:00', '2024-08-02 09:00:00', '2024-08-02 10:00:00', '2024-08-03 10:00:00', 'Jane Smith', '456 Oak Avenue, South City', 'West End Center', '234-567-8901', 'Medium', 'ACTIVE'),
('2024-08-03 10:00:00', '2024-08-03 10:00:00', '2024-08-03 11:00:00', '2024-08-04 11:00:00', 'Emily Johnson', '789 Pine Road, East Village', 'Northside Facility', '345-678-9012', 'Small', 'DELETE');

USE likelion12;

-- Insert random data into the activity_region table
INSERT INTO activity_region (
    created_at, modified_at, activity_region_name, status
) VALUES
('2024-08-01 09:00:00', '2024-08-01 09:00:00', 'North Zone', 'ACTIVE'),
('2024-08-02 10:00:00', '2024-08-02 10:00:00', 'South Region', 'ACTIVE'),
('2024-08-03 11:00:00', '2024-08-03 11:00:00', 'East Area', 'DELETE');
 USE likelion12;

-- Insert random data into the exercise table
INSERT INTO exercise (
    created_at, modified_at, exercise_name, status
) VALUES
('2024-08-01 09:00:00', '2024-08-01 09:00:00', 'Strength Training', 'ACTIVE'),
('2024-08-02 10:00:00', '2024-08-02 10:00:00', 'Cardio Workout', 'ACTIVE'),
('2024-08-03 11:00:00', '2024-08-03 11:00:00', 'Yoga Session', 'DELETE');
 USE likelion12;

-- Insert random data into the member table
INSERT INTO member (
    created_at, modified_at, exercise_id, email, member_img, member_name, gender, status
) VALUES
('2024-08-01 09:00:00', '2024-08-01 09:00:00', 1, '[email protected]', 'john_doe.jpg', 'John Doe', 'M', 'ACTIVE'),
('2024-08-02 10:00:00', '2024-08-02 10:00:00', 2, '[email protected]', 'jane_smith.jpg', 'Jane Smith', 'F', 'ACTIVE'),
('2024-08-03 11:00:00', '2024-08-03 11:00:00', 3, '[email protected]', 'alex_jones.jpg', 'Alex Jones', 'M', 'DELETE'),
('2024-08-04 12:00:00', '2024-08-04 12:00:00', 1, '[email protected]', 'mary_johnson.jpg', 'Mary Johnson', 'F', 'ACTIVE'),
('2024-08-05 13:00:00', '2024-08-05 13:00:00', 2, '[email protected]', 'michael_brown.jpg', 'Michael Brown', 'M', 'ACTIVE'),
('2024-08-06 14:00:00', '2024-08-06 14:00:00', 3, '[email protected]', 'emily_davis.jpg', 'Emily Davis', 'F', 'DELETE');
 USE likelion12;

-- Insert random data into the crew table
INSERT INTO crew (
    crew_cost, total_recruits, activity_region_id, created_at, crew_id, exercise_id, facility_id, modified_at, comment, comment_simple, crew_img, crew_name, gender, level, status
) VALUES
(1500, 50, 1, '2024-08-01 09:00:00', 1, 1, 1, '2024-08-01 09:00:00', 'Experienced crew for initial phase', 'Top performers', 'alpha_team.jpg', 'Alpha Team', 'M', 'A', 'ACTIVE'),
(1200, 40, 2, '2024-08-02 10:00:00', 2, 2, 2, '2024-08-02 10:00:00', 'Skilled crew for mid-level tasks', 'Highly capable', 'bravo_squad.jpg', 'Bravo Squad', 'F', 'S', 'ACTIVE'),
(1800, 60, 3, '2024-08-03 11:00:00', 3, 3, 3, '2024-08-03 11:00:00', 'Veteran crew for high-impact operations', 'Elite force', 'charlie_force.jpg', 'Charlie Force', 'U', 'B', 'ACTIVE'),
(1600, 55, 1, '2024-08-04 12:00:00', 4, 1, 1, '2024-08-04 12:00:00', 'Expert crew for critical missions', 'Star team', 'delta_unit.jpg', 'Delta Unit', 'M', 'C', 'ACTIVE'),
(1400, 45, 2, '2024-08-05 13:00:00', 5, 2, 2, '2024-08-05 13:00:00', 'Qualified crew for standard tasks', 'Prime team', 'echo_team.jpg', 'Echo Team', 'F', 'A', 'DELETE'),
(1100, 35, 3, '2024-08-06 14:00:00', 6, 3, 3, '2024-08-06 14:00:00', 'New recruits for training', 'Entry level', 'foxtrot_group.jpg', 'Foxtrot Group', 'U', 'B', 'ACTIVE');
 USE likelion12;

-- Insert random data into the socialring table
INSERT INTO socialring (
    socialring_cost, total_recruits, activity_region_id, created_at, exercise_id, facility_id, modified_at, socialring_date, socialring_id, comment, comment_simple, socialring_img, socialring_name, gender, level, status
) VALUES
(2000, 100, 1, '2024-08-01 08:00:00', 1, 1, '2024-08-01 08:00:00', '2024-08-15 10:00:00', 1, 'Top socialring in the North Region', 'Premier group', 'socialring1.jpg', 'Alpha Socialring', 'M', 'A', 'ACTIVE'),
(1800, 90, 2, '2024-08-02 09:15:00', 2, 2, '2024-08-02 09:15:00', '2024-08-16 11:00:00', 2, 'Highly active socialring in the South Region', 'Leading team', 'socialring2.jpg', 'Bravo Socialring', 'F', 'S', 'ACTIVE'),
(2200, 110, 3, '2024-08-03 10:30:00', 3, 3, '2024-08-03 10:30:00', '2024-08-17 12:00:00', 3, 'Elite socialring in the East Area', 'Top performers', 'socialring3.jpg', 'Charlie Socialring', 'U', 'B', 'ACTIVE'),
(1700, 85, 1, '2024-08-04 11:45:00', 1, 1, '2024-08-04 11:45:00', '2024-08-18 13:00:00', 4, 'Expert socialring for the North Zone', 'Star group', 'socialring4.jpg', 'Delta Socialring', 'M', 'C', 'ACTIVE'),
(1500, 70, 2, '2024-08-05 12:00:00', 2, 2, '2024-08-05 12:00:00', '2024-08-19 14:00:00', 5, 'Qualified socialring in the South Region', 'Prime team', 'socialring5.jpg', 'Echo Socialring', 'F', 'A', 'DELETE'),
(1300, 60, 3, '2024-08-06 13:15:00', 3, 3, '2024-08-06 13:15:00', '2024-08-20 15:00:00', 6, 'New socialring for East Area', 'Entry level', 'socialring6.jpg', 'Foxtrot Socialring', 'U', 'B', 'ACTIVE');
 USE likelion12;

-- Insert random data into the member_crew table
INSERT INTO member_crew (
    created_at, crew_id, member_crew_id, member_id, modified_at, role, status
) VALUES
('2024-08-01 08:00:00', 1, 1, 1, '2024-08-01 08:00:00', 'CAPTAIN', 'ACTIVE'),
('2024-08-01 09:15:00', 2, 2, 2, '2024-08-01 09:15:00', 'CREW', 'ACTIVE'),
('2024-08-01 10:30:00', 3, 3, 3, '2024-08-01 10:30:00', 'CAPTAIN', 'ACTIVE'),
('2024-08-02 11:45:00', 1, 4, 4, '2024-08-02 11:45:00', 'CREW', 'DELETE'),
('2024-08-02 12:00:00', 2, 5, 5, '2024-08-02 12:00:00', 'CAPTAIN', 'ACTIVE'),
('2024-08-02 13:15:00', 3, 6, 6, '2024-08-02 13:15:00', 'CREW', 'ACTIVE');

해더에 auth를 포함한 상태로 /main 에 Get 방식으로 요청합니다

{
    "code": 1000,
    "status": 200,
    "message": "요청에 성공하였습니다.",
    "result": {
        "deadline_imminent": [
            {
                "socialring_name": "Alpha Socialring",
                "socialring_img": "socialring1.jpg",
                "socialring_date": "2024-08-15",
                "active_area_id": 1,
                "total_recruits": 100,
                "socialring_cost": 2000,
                "comment_simple": "Premier group"
            },
            {
                "socialring_name": "Bravo Socialring",
                "socialring_img": "socialring2.jpg",
                "socialring_date": "2024-08-16",
                "active_area_id": 2,
                "total_recruits": 90,
                "socialring_cost": 1800,
                "comment_simple": "Leading team"
            },
            {
                "socialring_name": "Charlie Socialring",
                "socialring_img": "socialring3.jpg",
                "socialring_date": "2024-08-17",
                "active_area_id": 3,
                "total_recruits": 110,
                "socialring_cost": 2200,
                "comment_simple": "Top performers"
            },
            {
                "socialring_name": "Delta Socialring",
                "socialring_img": "socialring4.jpg",
                "socialring_date": "2024-08-18",
                "active_area_id": 1,
                "total_recruits": 85,
                "socialring_cost": 1700,
                "comment_simple": "Star group"
            }
        ],
        "hot_crew": [
            {
                "crew_name": "Alpha Team",
                "crew_img": "alpha_team.jpg",
                "active_area_id": 1,
                "total_recruits": 50,
                "crew_cost": 1500,
                "comment_simple": "Top performers"
            },
            {
                "crew_name": "Bravo Squad",
                "crew_img": "bravo_squad.jpg",
                "active_area_id": 2,
                "total_recruits": 40,
                "crew_cost": 1200,
                "comment_simple": "Highly capable"
            },
            {
                "crew_name": "Charlie Force",
                "crew_img": "charlie_force.jpg",
                "active_area_id": 3,
                "total_recruits": 60,
                "crew_cost": 1800,
                "comment_simple": "Elite force"
            },
            {
                "crew_name": "Delta Unit",
                "crew_img": "delta_unit.jpg",
                "active_area_id": 1,
                "total_recruits": 55,
                "crew_cost": 1600,
                "comment_simple": "Star team"
            }
        ]
    }
}

위와 같이 4개씩 출력되면 성공입니다

…10-be-첫-화면인기-마감임박-보여주기-구현 # Conflicts: # src/main/java/com/example/likelion12/common/exception/ExerciseException.java # src/main/java/com/example/likelion12/common/exception_handler/ExerciseExceptionControllerAdvice.java # src/main/java/com/example/likelion12/repository/CrewRepository.java

jsilver01

postman 응답오는 형태로 명세서 한번만 수정해주시면 될 것 같습니다!!
전부 제대로 반환되는 것 확인했습니다 수고하셨습니다~

src/main/java/com/example/likelion12/dto/Socialring.java

src/main/java/com/example/likelion12/dto/Crew.java

SonMyeongJin · 2024-08-01T11:57:02Z

Socialring_id 추가 , active_area_id -> active_area_name 변경
수정했습니다!

같은 방식으로 테스트시

{
    "code": 1000,
    "status": 200,
    "message": "요청에 성공하였습니다.",
    "result": {
        "deadline_imminent": [
            {
                "socialring_id": 1,
                "socialring_name": "Alpha Socialring",
                "socialring_img": "socialring1.jpg",
                "socialring_date": "2024-08-15",
                "active_area_name": "North Zone",
                "total_recruits": 100,
                "socialring_cost": 2000,
                "comment_simple": "Premier group"
            },
            {
                "socialring_id": 2,
                "socialring_name": "Bravo Socialring",
                "socialring_img": "socialring2.jpg",
                "socialring_date": "2024-08-16",
                "active_area_name": "South Region",
                "total_recruits": 90,
                "socialring_cost": 1800,
                "comment_simple": "Leading team"
            },
            {
                "socialring_id": 3,
                "socialring_name": "Charlie Socialring",
                "socialring_img": "socialring3.jpg",
                "socialring_date": "2024-08-17",
                "active_area_name": "East Area",
                "total_recruits": 110,
                "socialring_cost": 2200,
                "comment_simple": "Top performers"
            },
            {
                "socialring_id": 4,
                "socialring_name": "Delta Socialring",
                "socialring_img": "socialring4.jpg",
                "socialring_date": "2024-08-18",
                "active_area_name": "North Zone",
                "total_recruits": 85,
                "socialring_cost": 1700,
                "comment_simple": "Star group"
            }
        ],
        "hot_crew": [
            {
                "crew_id": 1,
                "crew_name": "Alpha Team",
                "crew_img": "alpha_team.jpg",
                "active_area_name": "North Zone",
                "total_recruits": 50,
                "crew_cost": 1500,
                "comment_simple": "Top performers"
            },
            {
                "crew_id": 2,
                "crew_name": "Bravo Squad",
                "crew_img": "bravo_squad.jpg",
                "active_area_name": "South Region",
                "total_recruits": 40,
                "crew_cost": 1200,
                "comment_simple": "Highly capable"
            },
            {
                "crew_id": 3,
                "crew_name": "Charlie Force",
                "crew_img": "charlie_force.jpg",
                "active_area_name": "East Area",
                "total_recruits": 60,
                "crew_cost": 1800,
                "comment_simple": "Elite force"
            },
            {
                "crew_id": 4,
                "crew_name": "Delta Unit",
                "crew_img": "delta_unit.jpg",
                "active_area_name": "North Zone",
                "total_recruits": 55,
                "crew_cost": 1600,
                "comment_simple": "Star team"
            }
        ]
    }
}

와 같이 출력되면 정상입니다!

jsilver01

정상 작동 확인하였습니다!! 너무 수고하셨습니다~ 머지하겠습니다!

손명진 and others added 30 commits August 1, 2024 00:00

Feat : Home 화면 Init

38f47ac

feat : DTO 추가

19463b5

feat : 서버 확인

e1d6f19

feat : 서버 확인

98aa19c

feat : 서버 확인

df68a7c

feat : 서버 확인

a188533

feat : 코드 원상복구

453c739

feat : application.yml 에 리다이렉트주소 추가

215b076

fix : Loginservice 에 리다이렉트주소 오류 발견 후 수정

ce83481

Feat : Home 화면 Init

a53819c

feat : DTO 변경 및 레퍼지토리, 서비스 추가

b1ea6c8

feat : DTO 변경 및 레퍼지토리, 서비스 추가

55db601

feat : Service 구현

e0dc668

feat : 서버 확인

f123f1b

fix : 어노테이션 수정

9dc985b

chore : 다시 localhost 로 수정

70e8e50

chore : .gradle/ 파일 무시하도록 gitignore 수정

21313a4

feat : 캐시 삭제

04ec476

feat : exercise 관련 exception 클래스 작성

4dc9077

feat : PostSignupRequest dto 작성

1261c08

feat : PostSignupResponse dto 작성

c5ffe26

feat : MemberController.signUp 작성

e24b31a

feat : MemberService.signUp 작성

4973c2b

feat : SecurityConfig에 회원가입 uri 추가

9d2c6b1

feat : 트랜잭션 어노테이션 추가

61b0f9c

fix : Jwt 관련 수정

75ff900

feat : 서버 확인

c5d0ada

fix : final,autowired 수정

a70c108

feat : 서버 확인

68e4a6f

feat : 캐시 삭제

28bd089

손명진 and others added 20 commits August 1, 2024 17:25

feat : DTO 변경 및 레퍼지토리, 서비스 추가

9bf2454

feat : Service 구현

79f8fbd

feat : 서버 확인

a8b9f6f

chore : .gradle/ 파일 무시하도록 gitignore 수정

07f4042

feat : 캐시 삭제

06d8ec0

feat : 서버 확인

5206f0d

fix : final,autowired 수정

515ea25

feat : 서버 확인

6daf05f

feat : 캐시 삭제

06ae221

feat : 필요한 레포지토리들 생성

b7e3fb8

fix : 충돌 해결

6948034

Remove .gradle directory from git tracking

d70de4b

feat : 캐시 삭제

64d88c5

feat : securityConfig에 헤더에 auth필요없도록 /main 추가

4c3bd78

feat : 캐시 삭제

69b4c5d

feat : 서버 확인

d877adc

feat : 필요한 레포지토리들 생성

2744d8f

fix : 충돌 해결

fd5c4e0

fix : Optional 감싸기 마지막 수정

a4c5923

SonMyeongJin linked an issue Aug 1, 2024 that may be closed by this pull request

[BE] 첫 화면(인기, 마감임박 보여주기) 구현 #10

Closed

jsilver01 approved these changes Aug 1, 2024

View reviewed changes

src/main/java/com/example/likelion12/dto/Socialring.java Show resolved Hide resolved

src/main/java/com/example/likelion12/dto/Crew.java Show resolved Hide resolved

jsilver01 changed the title ~~10 be 첫 화면인기 마감임박 보여주기 구현~~ Feat : 첫 화면인기 마감임박 보여주기 구현 Aug 1, 2024

손명진 added 2 commits August 1, 2024 18:21

fix : id 값 추가 및 area_id -> area_name 변경

af4674f

fix : @transactional 추가

24e3886

Merge branch 'develop' into 10-be-첫-화면인기-마감임박-보여주기-구현

497d64b

jsilver01 approved these changes Aug 1, 2024

View reviewed changes

jsilver01 merged commit cd8d06d into develop Aug 1, 2024

jsilver01 deleted the 10-be-첫-화면인기-마감임박-보여주기-구현 branch August 1, 2024 13:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat : 첫 화면인기 마감임박 보여주기 구현 #40

Feat : 첫 화면인기 마감임박 보여주기 구현 #40

SonMyeongJin commented Aug 1, 2024 •

edited by jsilver01

Loading

jsilver01 left a comment

SonMyeongJin commented Aug 1, 2024

jsilver01 left a comment

Feat : 첫 화면인기 마감임박 보여주기 구현 #40

Feat : 첫 화면인기 마감임박 보여주기 구현 #40

Conversation

SonMyeongJin commented Aug 1, 2024 • edited by jsilver01 Loading

요약 (Summary)

🔑 변경 사항 (Key Changes)

📝 리뷰 요구사항 (To Reviewers)

jsilver01 left a comment

Choose a reason for hiding this comment

SonMyeongJin commented Aug 1, 2024

jsilver01 left a comment

Choose a reason for hiding this comment

SonMyeongJin commented Aug 1, 2024 •

edited by jsilver01

Loading