v1.0.6

.gitignore

@@ -1,6 +1,8 @@
 # auth
 layer-api/src/main/resources/application.yml
 
+layer-api/src/main/resources/application-secret.properties
+
 # q
 layer-domain/src/main/generated/
 
@@ -42,7 +44,9 @@ out/
 
 ### VS Code ###
 .vscode/
-*.properties
+#*.properties
+
+
 *.sql
 
 layer-domain/src/main/generated

layer-api/src/main/java/org/layer/domain/admin/controller/AdminApi.java

@@ -1,18 +1,20 @@
 package org.layer.domain.admin.controller;
 
-import java.time.LocalDateTime;
-
-import org.layer.domain.admin.controller.dto.AdminRetrospectsGetResponse;
-import org.layer.domain.admin.controller.dto.AdminSpacesGetResponse;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.layer.domain.admin.controller.dto.AdminRetrospectCountGetResponse;
+import org.layer.domain.admin.controller.dto.AdminRetrospectsGetResponse;
+import org.layer.domain.admin.controller.dto.AdminSpaceCountGetResponse;
+import org.layer.domain.admin.controller.dto.AdminSpacesGetResponse;
+import org.layer.domain.retrospect.dto.AdminRetrospectCountGroupBySpaceGetResponse;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Tag(name = "어드민", description = "어드민 관련 API")
 public interface AdminApi {
@@ -32,4 +34,41 @@ ResponseEntity<AdminSpacesGetResponse> getSpaceData(@RequestParam("startDate") L
 		@Parameter(name = "password", description = "비밀번호 [카톡방으로 공유]", example = "[카톡방으로 공유]", required = true, schema = @Schema(type = "string", format = "string"))})
 	ResponseEntity<AdminRetrospectsGetResponse> getRetrospectData(@RequestParam("startDate") LocalDateTime startDate,
 		@RequestParam("endDate") LocalDateTime endDate, @RequestParam("password") String password);
+
+	@Operation(summary = "스페이스 개수 조회", description = "특정 기간내에 만들어진 스페이스 개수를 조회합니다. (우리 팀원이 만든 스페이스는 제외)")
+	@Parameters({
+			@Parameter(name = "startDate", description = "검색 시작 시간", example = "2024-09-05T15:30:45", required = true, schema = @Schema(type = "string")),
+			@Parameter(name = "endDate", description = "검색 종료 시간", example = "2024-09-13T15:30:45", required = true, schema = @Schema(type = "string")),
+			@Parameter(name = "password", description = "비밀번호 [카톡방으로 공유]", example = "[카톡방으로 공유]", required = true, schema = @Schema(type = "string", format = "string"))})
+	ResponseEntity<AdminSpaceCountGetResponse> getSpaceCount(@RequestParam("startDate") LocalDateTime startDate,
+															 @RequestParam("endDate") LocalDateTime endDate, @RequestParam("password") String password);
+
+	@Operation(summary = "회고 개수 조회", description = "특정 기간내에 시작된 회고 개수를 조회합니다. (우리 팀원이 만든 스페이스에서 진행된 회고는 제외)")
+	@Parameters({
+			@Parameter(name = "startDate", description = "검색 시작 시간", example = "2024-09-05T15:30:45", required = true, schema = @Schema(type = "string")),
+			@Parameter(name = "endDate", description = "검색 종료 시간", example = "2024-09-13T15:30:45", required = true, schema = @Schema(type = "string")),
+			@Parameter(name = "password", description = "비밀번호 [카톡방으로 공유]", example = "[카톡방으로 공유]", required = true, schema = @Schema(type = "string", format = "string"))})
+	ResponseEntity<AdminRetrospectCountGetResponse> getRetrospectCount(@RequestParam("startDate") LocalDateTime startDate,
+																	   @RequestParam("endDate") LocalDateTime endDate, @RequestParam("password") String password);
+
+
+	@Operation(summary = "특정 스페이스 내 회고 개수 조회", description = "특정 기간내에 특정 스페이스 안에서 시작된 회고 개수를 조회합니다.")
+	@Parameters({
+			@Parameter(name = "startDate", description = "검색 시작 시간", example = "2024-09-05T15:30:45", required = true, schema = @Schema(type = "string")),
+			@Parameter(name = "endDate", description = "검색 종료 시간", example = "2024-09-13T15:30:45", required = true, schema = @Schema(type = "string")),
+			@Parameter(name = "password", description = "비밀번호 [카톡방으로 공유]", example = "[카톡방으로 공유]", required = true, schema = @Schema(type = "string", format = "string"))})
+	ResponseEntity<AdminRetrospectCountGetResponse> getRetrospectCountInSpace(@RequestParam("startDate") LocalDateTime startDate,
+																			  @RequestParam("endDate") LocalDateTime endDate,
+																			  @RequestParam("spaceId") Long spaceId,
+																			  @RequestParam("password") String password);
+
+
+	@Operation(summary = "특정 기간 내 회고 개수 스페이스 별로 보기", description = "특정 기간내에 시작된 회고 개수를 스페이스 별로 조회합니다. (우리 팀원이 만든 스페이스는 제외)")
+	@Parameters({
+			@Parameter(name = "startDate", description = "검색 시작 시간", example = "2024-09-05T15:30:45", required = true, schema = @Schema(type = "string")),
+			@Parameter(name = "endDate", description = "검색 종료 시간", example = "2024-09-13T15:30:45", required = true, schema = @Schema(type = "string")),
+			@Parameter(name = "password", description = "비밀번호 [카톡방으로 공유]", example = "[카톡방으로 공유]", required = true, schema = @Schema(type = "string", format = "string"))})
+	ResponseEntity<List<AdminRetrospectCountGroupBySpaceGetResponse>> getRetrospectCountGroupBySpace (@RequestParam("startDate") LocalDateTime startDate,
+																									  @RequestParam("endDate") LocalDateTime endDate,
+																									  @RequestParam("password") String password);
 }

layer-api/src/main/java/org/layer/domain/admin/controller/AdminController.java

@@ -1,19 +1,17 @@
 package org.layer.domain.admin.controller;
 
-import java.time.LocalDateTime;
-
-import org.layer.common.annotation.MemberId;
+import lombok.RequiredArgsConstructor;
+import org.layer.domain.admin.controller.dto.AdminRetrospectCountGetResponse;
 import org.layer.domain.admin.controller.dto.AdminRetrospectsGetResponse;
+import org.layer.domain.admin.controller.dto.AdminSpaceCountGetResponse;
 import org.layer.domain.admin.controller.dto.AdminSpacesGetResponse;
 import org.layer.domain.admin.service.AdminService;
+import org.layer.domain.retrospect.dto.AdminRetrospectCountGroupBySpaceGetResponse;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import lombok.RequiredArgsConstructor;
+import java.time.LocalDateTime;
+import java.util.List;
 
 @RestController
 @RequiredArgsConstructor
@@ -40,4 +38,39 @@ public ResponseEntity<AdminRetrospectsGetResponse> getRetrospectData(
 
 		return ResponseEntity.ok(adminService.getRetrospectData(startDate, endDate, password));
 	}
+
+	@Override
+	@GetMapping("/space/count/user-only")
+	public ResponseEntity<AdminSpaceCountGetResponse> getSpaceCount(
+			@RequestParam("startDate") LocalDateTime startDate,
+			@RequestParam("endDate") LocalDateTime endDate,
+			@RequestParam("password") String password) {
+		return ResponseEntity.ok(adminService.getSpaceCount(startDate, endDate, password));
+	}
+
+	@Override
+	@GetMapping("/retrospect/count/user-only")
+	public ResponseEntity<AdminRetrospectCountGetResponse> getRetrospectCount(
+			@RequestParam("startDate") LocalDateTime startDate,
+			@RequestParam("endDate") LocalDateTime endDate,
+			@RequestParam("password") String password) {
+
+		return ResponseEntity.ok(adminService.getRetrospectCount(startDate, endDate, password));
+	}
+
+	@Override
+	@GetMapping("space/{spaceId}/retrospect/count")
+	public ResponseEntity<AdminRetrospectCountGetResponse> getRetrospectCountInSpace(@RequestParam("startDate") LocalDateTime startDate,
+																					 @RequestParam("endDate") LocalDateTime endDate,
+																					 @PathVariable("spaceId") Long spaceId,
+																					 @RequestParam("password") String password) {
+		return ResponseEntity.ok(adminService.getRetrospectCountInSpace(startDate, endDate, spaceId, password));
+	}
+
+	@Override
+	@GetMapping("/retrospect/count/group-by-space")
+	public ResponseEntity<List<AdminRetrospectCountGroupBySpaceGetResponse>> getRetrospectCountGroupBySpace(LocalDateTime startDate, LocalDateTime endDate, String password) {
+		return ResponseEntity.ok(adminService.getRetrospectCountGroupSpace(startDate, endDate, password));
+	}
+
 }

layer-api/src/main/java/org/layer/domain/admin/controller/dto/AdminRetrospectCountGetResponse.java

@@ -0,0 +1,9 @@
+package org.layer.domain.admin.controller.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "AdminSpaceCountGetResponse", description = "우리 팀이 만든 스페이스에서 진행된 회고를 제외하고 기간 내에 시작된 회고 수를 리턴합니다.")
+public record AdminRetrospectCountGetResponse(
+        @Schema(description = "기간 내에 만들어진 회고 개수", example = "20")
+        Long retrospectCount) {
+}

layer-api/src/main/java/org/layer/domain/admin/controller/dto/AdminSpaceCountGetResponse.java

@@ -0,0 +1,9 @@
+package org.layer.domain.admin.controller.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "AdminSpaceCountGetResponse", description = "우리 팀이 만든 스페이스를 제외하고 기간 내에 만들어진 스페이스 개수를 리턴합니다.")
+public record AdminSpaceCountGetResponse(
+        @Schema(description = "기간 내에 만들어진 스페이스 개수", example = "11")
+        Long spaceCount) {
+}

layer-api/src/main/java/org/layer/domain/admin/service/AdminService.java

@@ -1,21 +1,21 @@
 package org.layer.domain.admin.service;
 
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Optional;
-
+import lombok.RequiredArgsConstructor;
+import org.layer.domain.admin.controller.dto.AdminRetrospectCountGetResponse;
 import org.layer.domain.admin.controller.dto.AdminRetrospectsGetResponse;
+import org.layer.domain.admin.controller.dto.AdminSpaceCountGetResponse;
 import org.layer.domain.admin.controller.dto.AdminSpacesGetResponse;
+import org.layer.domain.retrospect.dto.AdminRetrospectCountGroupBySpaceGetResponse;
 import org.layer.domain.retrospect.dto.AdminRetrospectGetResponse;
 import org.layer.domain.retrospect.repository.RetrospectAdminRepository;
 import org.layer.domain.space.dto.AdminSpaceGetResponse;
-import org.layer.domain.space.entity.Space;
 import org.layer.domain.space.repository.SpaceAdminRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import lombok.RequiredArgsConstructor;
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Service
 @RequiredArgsConstructor
@@ -49,4 +49,39 @@ public AdminRetrospectsGetResponse getRetrospectData(LocalDateTime startDate, Lo
 
 		return new AdminRetrospectsGetResponse(retrospects, retrospects.size());
 	}
+
+	public AdminSpaceCountGetResponse getSpaceCount(LocalDateTime startDate, LocalDateTime endDate, String requestPassword) {
+		if(!requestPassword.equals(password)) {
+			throw new IllegalArgumentException("비밀번호가 틀렸습니다.");
+		}
+
+		Long count = spaceAdminRepository.countSpacesExceptForAdminSpace(startDate, endDate);
+		return new AdminSpaceCountGetResponse(count);
+	}
+
+	public AdminRetrospectCountGetResponse getRetrospectCount(LocalDateTime startDate, LocalDateTime endDate, String requestPassword) {
+		if(!requestPassword.equals(password)) {
+			throw new IllegalArgumentException("비밀번호가 틀렸습니다.");
+		}
+
+		Long count = retrospectAdminRepository.countRetrospectsExceptForAdminSpace(startDate, endDate);
+		return new AdminRetrospectCountGetResponse(count);
+	}
+
+	public AdminRetrospectCountGetResponse getRetrospectCountInSpace(LocalDateTime startDate, LocalDateTime endDate, Long spaceId, String requestPassword) {
+		if(!requestPassword.equals(password)) {
+			throw new IllegalArgumentException("비밀번호가 틀렸습니다.");
+		}
+
+		Long count = retrospectAdminRepository.countRetrospectsBySpaceId(spaceId, startDate, endDate);
+		return new AdminRetrospectCountGetResponse(count);
+	}
+
+	public List<AdminRetrospectCountGroupBySpaceGetResponse> getRetrospectCountGroupSpace(LocalDateTime startDate, LocalDateTime endDate, String requestPassword) {
+		if(!requestPassword.equals(password)) {
+			throw new IllegalArgumentException("비밀번호가 틀렸습니다.");
+		}
+
+		return retrospectAdminRepository.countRetrospectsGroupBySpace(startDate, endDate);
+	}
 }

layer-api/src/main/java/org/layer/domain/form/controller/FormController.java

@@ -38,7 +38,7 @@ public ResponseEntity<RecommendFormResponseDto> getRecommendTemplate(
 		@Valid @ModelAttribute RecommendFormQueryDto queryDto,
 		@MemberId Long memberId) {
 
-		RecommendFormResponseDto response = formService.getRecommendTemplate(queryDto, memberId);
+		RecommendFormResponseDto response = formService.getRecommendTemplate(queryDto);
 		return ResponseEntity.ok().body(response);
 	}
 

layer-api/src/main/java/org/layer/domain/form/service/FormService.java

@@ -10,6 +10,8 @@
 import org.layer.domain.form.controller.dto.response.QuestionGetResponse;
 import org.layer.domain.form.controller.dto.response.RecommendFormResponseDto;
 import org.layer.domain.form.entity.Form;
+import org.layer.domain.form.entity.FormType;
+import org.layer.domain.form.enums.FormTag;
 import org.layer.domain.form.exception.FormException;
 import org.layer.domain.form.repository.FormRepository;
 import org.layer.domain.question.entity.Question;
@@ -44,9 +46,6 @@ public class FormService {
 	private final SpaceRepository spaceRepository;
 	private final TemplateMetadataRepository metadataRepository;
 
-	private static final int MIN = 10000;
-	private static final int MAX = 10005;
-
 	/**
 	 * 회고 폼 질문을 조회한다.
 	 *
@@ -72,13 +71,11 @@ public FormGetResponse getForm(Long formId, Long memberId) {
 		return FormGetResponse.of(form.getTitle(), form.getFormTag().getTag(), questionResponses);
 	}
 
-	public RecommendFormResponseDto getRecommendTemplate(RecommendFormQueryDto queryDto, Long memberId) {
-		Random random = new Random();
-		Long formId = random.nextLong(MAX - MIN + 1) + MIN;
+	public RecommendFormResponseDto getRecommendTemplate(RecommendFormQueryDto queryDto) {
+		FormTag recommandFormTag = FormTag.getRecommandFormTag(queryDto.purpose());
 
-		Form form = formRepository.findByIdOrThrow(formId);
-		TemplateMetadata metadata = metadataRepository.findByFormIdOrThrow(formId);
-		// TODO: 템플릿 이미지 필요
+		Form form = formRepository.findByFormTagAndFormTypeOrThrow(recommandFormTag, FormType.TEMPLATE);
+		TemplateMetadata metadata = metadataRepository.findByFormIdOrThrow(form.getId());
 
 		return RecommendFormResponseDto.of(form, metadata.getTemplateImageUrl());
 	}

layer-api/src/main/java/org/layer/domain/retrospect/controller/dto/request/RetrospectCreateRequest.java

@@ -5,7 +5,6 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
 
 public record RetrospectCreateRequest(
 	@Schema(description = "회고 제목", example = "중간 발표 이후 회고")
@@ -17,7 +16,6 @@ public record RetrospectCreateRequest(
 	@NotNull
 	List<QuestionCreateRequest> questions,
 	@Schema(description = "회고 마감 일자", example = "")
-	@NotNull
 	LocalDateTime deadline,
 	@Schema(description = "질문을 수정한 경우 true", example = "true")
 	Boolean isNewForm,

layer-api/src/main/java/org/layer/domain/retrospect/service/RetrospectService.java

@@ -57,8 +57,6 @@ public Long createRetrospect(RetrospectCreateRequest request, Long spaceId, Long
 		Team team = new Team(memberSpaceRelationRepository.findAllBySpaceId(spaceId));
 		team.validateTeamMembership(memberId);
 
-
-
 		Retrospect retrospect = getRetrospect(request, spaceId);
 		Retrospect savedRetrospect = retrospectRepository.save(retrospect);
 

layer-api/src/main/resources/application-local.yml

@@ -54,6 +54,7 @@ google:
   sheet:
     id: ${GOOGLE_SHEET_ID}
     token_path: ${LOCAL_GOOGLE_TOKEN_PATH}
+    credential_path: ${PROD_GOOGLE_CREDENTIAL_PATH}
 
 apple:
   login:

layer-domain/src/main/java/org/layer/domain/form/enums/FormTag.java

@@ -1,18 +1,42 @@
 package org.layer.domain.form.enums;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 @Getter
 public enum FormTag {
-    KPT("KPT"),
-    FIVE_F("5F"),
-    MAD_SAD_GLAD("Mad Sad Glad"),
-    SSC("SSC"),
-    PMI("PMI"),
-    UNTITLED("무제"),
-    CUSTOM("CUSTOM");
+	KPT("KPT"),
+	FIVE_F("5F"),
+	MAD_SAD_GLAD("Mad Sad Glad"),
+	SSC("SSC"),
+	PMI("PMI"),
+	UNTITLED("무제"),
+	CUSTOM("CUSTOM");
+
+	private final String tag;
+
+	public static FormTag getRecommandFormTag(List<RetrospectPurpose> retrospectPurposes) {
+		Map<FormTag, Integer> formTagIntegerMap = EnumSet.allOf(FormTag.class).stream()
+			.collect(Collectors.toMap(tag -> tag, tag -> 0));
+
+		retrospectPurposes.forEach(purpose -> {
+			formTagIntegerMap.put(KPT, formTagIntegerMap.get(KPT) + purpose.getKtpPoint());
+			formTagIntegerMap.put(FIVE_F, formTagIntegerMap.get(FIVE_F) + purpose.getFiveFPoint());
+			formTagIntegerMap.put(MAD_SAD_GLAD, formTagIntegerMap.get(MAD_SAD_GLAD) + purpose.getMadSadGladPoint());
+			formTagIntegerMap.put(SSC, formTagIntegerMap.get(SSC) +purpose.getSscPoint());
+			formTagIntegerMap.put(PMI, formTagIntegerMap.get(PMI) +purpose.getPmiPont());
+		});
 
-    private final String tag;
+		return formTagIntegerMap.entrySet()
+			.stream()
+			.max(Map.Entry.comparingByValue())
+			.map(Map.Entry::getKey)
+			.orElse(FormTag.UNTITLED);
+	}
 }