Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package org.withtime.be.withtimebe.domain.date.repository;

import java.time.LocalDate;
import java.time.LocalDateTime;

import org.springframework.data.jpa.repository.JpaRepository;
import org.withtime.be.withtimebe.domain.date.entity.DateCourse;

public interface DateCourseRepository extends JpaRepository<DateCourse, Long> {
Long countByCreatedAtBetween(LocalDate startTime, LocalDate endTime);
Long countByCreatedAtBetween(LocalDateTime startTime, LocalDateTime endTime);
Long countByMemberId(Long memberId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;

@RestController
@AllArgsConstructor
@RequestMapping("/api/v1/faqs")
@Tag(name = "자주 λ¬»λŠ” 질문 μˆ˜μ • κ΄€λ ¨ API")
public class FaqCommandController {

private final FaqCommandService faqCommandService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;

@RestController
@AllArgsConstructor
@RequestMapping("/api/v1/faqs")
@Tag(name = "자주 λ¬»λŠ” 질문 쑰회 κ΄€λ ¨ API")
public class FaqQueryController {

private final FaqQueryService faqQueryService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/logs/datecourses")
@Tag(name = "데이트 μ½”μŠ€ 톡계 κ΄€λ ¨ API")
public class DateCourseLogQueryController {

private final DateCourseLogQueryService dateCourseLogQueryService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.withtime.be.withtimebe.domain.log.datecourselog.service.query;

import java.time.LocalDate;
import java.time.LocalDateTime;

import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -29,7 +30,10 @@ public DateCourseLogResponseDTO.FindAverageDateCourseCount findAverageDateCourse
LocalDate oneMonthAgo = now.minusDays(30);

// 졜근 1κ°œμ›”λ™μ•ˆ μƒμ„±λœ 데이트 μ½”μŠ€
Long dateCourseCount = dateCourseRepository.countByCreatedAtBetween(oneMonthAgo, now);
Long dateCourseCount = dateCourseRepository.countByCreatedAtBetween(
oneMonthAgo.atStartOfDay(),
now.plusDays(1).atStartOfDay()
);

// 전체 멀버 수
Long memberCount = memberRepository.count();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@
import org.springframework.web.bind.annotation.RestController;
import org.withtime.be.withtimebe.domain.log.dateplacelog.converter.DatePlaceLogConverter;
import org.withtime.be.withtimebe.domain.log.dateplacelog.dto.DatePlaceLogResponseDTO;
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;
import org.withtime.be.withtimebe.domain.log.dateplacelog.service.query.DatePlaceLogQueryService;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/logs/dateplaces")
@Tag(name = "데이트 μž₯μ†Œ 톡계 κ΄€λ ¨ API")
public class DatePlaceLogQueryController {

private final DatePlaceLogQueryService datePlaceLogQueryService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package org.withtime.be.withtimebe.domain.log.dateplacelog.converter;

import java.time.LocalDate;
import java.time.LocalTime;
import java.util.List;

import org.withtime.be.withtimebe.domain.log.dateplacelog.dto.DatePlaceLogResponseDTO;
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;

public class DatePlaceLogConverter {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.withtime.be.withtimebe.domain.log.dateplacelog.entity;
package org.withtime.be.withtimebe.domain.log.dateplacelog.model;

import java.time.LocalDate;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.withtime.be.withtimebe.domain.log.dateplacelog.repository;

import org.springframework.data.mongodb.repository.MongoRepository;
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;

public interface DatePlaceLogRepository extends MongoRepository<DatePlaceLog, String> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.withtime.be.withtimebe.domain.date.repository.DatePlaceRepository;
import org.withtime.be.withtimebe.domain.log.dateplacelog.converter.DatePlaceLogConverter;
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;
import org.withtime.be.withtimebe.domain.log.dateplacelog.repository.DatePlaceLogRepository;

import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.List;

import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;

public interface DatePlaceLogQueryService {
List<DatePlaceLog> findMonthlyDatePlaceLogList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.springframework.data.mongodb.core.aggregation.SortOperation;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;

import lombok.RequiredArgsConstructor;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/logs/keyword")
@Tag(name = "ν‚€μ›Œλ“œ 톡계 κ΄€λ ¨ API")
public class PlaceCategoryLogQueryController {

private final PlaceCategoryLogQueryService placeCategoryLogQueryService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/admin/notices")
@RequestMapping("/api/v1/notices")
@Tag(name = "곡지사항 μˆ˜μ • κ΄€λ ¨ API")
public class NoticeCommandController {

private final NoticeCommandService noticeCommandService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/notices")
@Tag(name = "곡지사항 쑰회 κ΄€λ ¨ API")
public class NoticeQueryController {

private final NoticeQueryService noticeQueryService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.withtime.be.withtimebe.domain.log.dateplacelog.service.query;

import static org.assertj.core.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.BDDMockito.*;

Expand All @@ -19,7 +18,7 @@
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.aggregation.Aggregation;
import org.springframework.data.mongodb.core.aggregation.AggregationResults;
import org.withtime.be.withtimebe.domain.log.dateplacelog.entity.DatePlaceLog;
import org.withtime.be.withtimebe.domain.log.dateplacelog.model.DatePlaceLog;

@ExtendWith(MockitoExtension.class)
@DisplayName("[DatePlaceLogQueryService] λ‹¨μœ„ ν…ŒμŠ€νŠΈ")
Expand Down