Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚢 release: merge to main #303

Merged
merged 15 commits into from
Aug 22, 2023
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
36 changes: 0 additions & 36 deletions .github/workflows/docusaurus.yml

This file was deleted.

30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@
[![Github Action](https://github.com/depromeet/street-drop-server/actions/workflows/jacoco.yml/badge.svg)](https://github.com/depromeet/street-drop-server/actions)

## 💁‍♂️ Introduction
![intro-main](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/intro-main.jpg?raw=true)
![intro-description](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/intro-description.jpg?raw=true)
![home](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/home.jpg?raw=true)
![radius](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/radius.jpg?raw=true)
![search](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/search.jpg?raw=true)
![comment](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/commnet.jpg?raw=true)
![home-2](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/home-2.jpg?raw=true)
![community](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/community.jpg?raw=true)
![mypage](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/mypage.jpg?raw=true)
![setting](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/setting.jpg?raw=true)
![push-notification](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/push-notification.jpg?raw=true)
![let's-go](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/lets-go.jpg?raw=true)
![intro-main](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/intro-main.jpeg?raw=true)
![intro-description](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/intro-description.jpeg?raw=true)
![home](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/home.jpeg?raw=true)
![radius](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/radius%202.jpeg?raw=true)
![search](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/search.jpeg?raw=true)
![comment](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/commnet.jpeg?raw=true)
![home-2](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/home-2.jpeg?raw=true)
![community](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/community.jpeg?raw=true)
![mypage](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/mypage%202.jpeg?raw=true)
![setting](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/setting.jpeg?raw=true)
![push-notification](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/push-notification.jpeg?raw=true)
![let's-go](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/lets-go.jpeg?raw=true)

<p align="center">
<a href="https://apps.apple.com/kr/app/%EC%8A%A4%ED%8A%B8%EB%A6%BF%EB%93%9C%EB%9E%8D-street-drop/id6450315928" style="display: inline-block; overflow: hidden; border-radius: 13px; width: 250px; height: 83px;"><img src="https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-us?size=250x83&amp;releaseDate=1641254400&h=ddfff0c3bd61d9f88f53494b401881d3" alt="Download on the App Store" style="border-radius: 13px; width: 250px; height: 83px;"></a>
</p>

## 💁‍♀️ User Flow
![user-flow](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/user-flow.png?raw=true)
![user-flow](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/user-flow.jpeg?raw=true)

## 👜 Repository
| [street-drop-iOS](https://github.com/depromeet/street-drop-iOS) | [street-drop-server](https://github.com/depromeet/street-drop-server) |
Expand Down Expand Up @@ -64,10 +64,10 @@
<img src="https://img.shields.io/badge/Firebase Cloud Messaging-FFCA28?style=for-the-social&logo=firebase&logoColor=white">

## 🚎 Architecture
![server-architecture](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/sever-architecture.png?raw=true)
![server-architecture](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/sever-architecture.jpeg?raw=true)

## 📈 ERD
![ERD](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/ERD.png?raw=true)
![ERD](https://github.com/siyeonSon/ReadmeImage/blob/main/street-drop-server/ERD.jpeg?raw=true)

## 🧑‍💻 Server Engineers
| Profile | Contact | Github |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.depromeet.auth.controller;

import com.depromeet.auth.entity.Member;
import com.depromeet.auth.service.AuthService;
import com.depromeet.auth.service.MemberService;
import com.depromeet.global.annotation.ReqMember;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.common;
package com.depromeet.common;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.common.dto;
package com.depromeet.common.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.depromeet.apis.item.controller;
package com.depromeet.domains.item.controller;

import com.depromeet.apis.item.dto.ItemAllResponseDto;
import com.depromeet.apis.user.dto.ResponseDto;
import com.depromeet.domains.item.dto.ItemAllResponseDto;
import com.depromeet.domains.user.dto.ResponseDto;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.depromeet.apis.item.controller;
package com.depromeet.domains.item.controller;

import com.depromeet.apis.common.dto.PageMetaData;
import com.depromeet.apis.item.dto.ItemAllResponseDto;
import com.depromeet.apis.item.dto.ItemResponseDto;
import com.depromeet.apis.item.repository.ItemRepository;
import com.depromeet.common.dto.PageMetaData;
import com.depromeet.domains.item.dto.ItemAllResponseDto;
import com.depromeet.domains.item.dto.ItemResponseDto;
import com.depromeet.domains.item.repository.ItemRepository;
import com.depromeet.item.Item;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.depromeet.apis.item.dto;
package com.depromeet.domains.item.dto;

import com.depromeet.apis.common.dto.PageMetaData;
import com.depromeet.common.dto.PageMetaData;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.item.dto;
package com.depromeet.domains.item.dto;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.item.repository;
package com.depromeet.domains.item.repository;

import com.depromeet.item.Item;
import com.depromeet.user.User;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.depromeet.apis.user.controller;
package com.depromeet.domains.user.controller;


import com.depromeet.apis.user.dto.ResponseDto;
import com.depromeet.apis.user.dto.UserAllResponseDto;
import com.depromeet.apis.user.dto.UserDetailResponseDto;
import com.depromeet.apis.user.service.UserService;
import com.depromeet.domains.user.dto.ResponseDto;
import com.depromeet.domains.user.dto.UserAllResponseDto;
import com.depromeet.domains.user.dto.UserDetailResponseDto;
import com.depromeet.domains.user.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package com.depromeet.apis.user.controller;
package com.depromeet.domains.user.controller;

import com.depromeet.apis.user.dto.UserAllStaticCountDto;
import com.depromeet.apis.user.dto.UserSignUpCountRequestDto;
import com.depromeet.apis.user.dto.UserSignUpCountResponseDto;
import com.depromeet.apis.user.service.UserStaticService;
import lombok.Getter;
import com.depromeet.domains.user.dto.UserAllStaticCountDto;
import com.depromeet.domains.user.dto.UserSignUpCountRequestDto;
import com.depromeet.domains.user.dto.UserSignUpCountResponseDto;
import com.depromeet.domains.user.service.UserStaticService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.user.dto;
package com.depromeet.domains.user.dto;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.user.dto;
package com.depromeet.domains.user.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.depromeet.apis.user.dto;
package com.depromeet.domains.user.dto;

import com.depromeet.apis.common.dto.PageMetaData;
import com.depromeet.common.dto.PageMetaData;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.user.dto;
package com.depromeet.domains.user.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.user.dto;
package com.depromeet.domains.user.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.user.dto;
package com.depromeet.domains.user.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.user.dto;
package com.depromeet.domains.user.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.depromeet.apis.user.dto;
package com.depromeet.domains.user.dto;

import com.depromeet.user.User;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.user.dto;
package com.depromeet.domains.user.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.user.dto;
package com.depromeet.domains.user.dto;

public record UserSignUpCountResponseDto(String date, Long count) {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.user.repository;
package com.depromeet.domains.user.repository;

import com.depromeet.user.User;
import org.springframework.data.domain.Page;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.depromeet.apis.user.service;
package com.depromeet.domains.user.service;

import com.depromeet.apis.common.dto.PageMetaData;
import com.depromeet.apis.item.repository.ItemRepository;
import com.depromeet.apis.user.dto.*;
import com.depromeet.apis.user.repository.UserRepository;
import com.depromeet.common.dto.PageMetaData;
import com.depromeet.domains.item.repository.ItemRepository;
import com.depromeet.domains.user.dto.*;
import com.depromeet.domains.user.repository.UserRepository;
import com.depromeet.user.User;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.depromeet.apis.user.service;
package com.depromeet.domains.user.service;

import com.depromeet.apis.user.dto.UserAllStaticCountDto;
import com.depromeet.apis.user.dto.UserSignUpCountRequestDto;
import com.depromeet.apis.user.dto.UserSignUpCountResponseDto;
import com.depromeet.apis.user.repository.UserRepository;
import com.depromeet.domains.user.dto.UserAllStaticCountDto;
import com.depromeet.domains.user.dto.UserSignUpCountRequestDto;
import com.depromeet.domains.user.dto.UserSignUpCountResponseDto;
import com.depromeet.domains.user.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.depromeet.apis.village.controller;
package com.depromeet.domains.village.controller;

import com.depromeet.apis.village.service.VillageService;
import com.depromeet.domains.village.service.VillageService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.village.dto;
package com.depromeet.domains.village.dto;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.depromeet.apis.village.repository;
package com.depromeet.domains.village.repository;

import com.depromeet.area.village.VillageArea;
import org.springframework.data.jpa.repository.JpaRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.depromeet.apis.village.service;
package com.depromeet.domains.village.service;

import com.depromeet.apis.village.dto.ItemCountPerVillageResponseDto;
import com.depromeet.apis.village.repository.VillageRepository;
import com.depromeet.domains.village.dto.ItemCountPerVillageResponseDto;
import com.depromeet.domains.village.repository.VillageRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.depromeet.global.security.config;


import com.depromeet.auth.repository.MemberRepository;
import com.depromeet.auth.repository.MemoryMemberRepository;
import com.depromeet.global.security.filter.CustomUsernamePasswordAuthenticationFilter;
import com.depromeet.global.security.filter.JwtAuthenticationFilter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@


import com.depromeet.auth.entity.Member;
import com.depromeet.auth.repository.MemberRepository;
import com.depromeet.auth.repository.MemoryMemberRepository;
import com.depromeet.exception.BusinessException;
import com.depromeet.exception.ErrorResponse;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;


import java.io.IOException;

@Slf4j
Expand Down
3 changes: 3 additions & 0 deletions backend/streetdrop-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ dependencies {

implementation 'org.springframework.boot:spring-boot-starter-webflux'
implementation 'io.awspring.cloud:spring-cloud-starter-aws:2.3.1'

implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-mysql'
}

test {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@RestController
public class HealthController {

@GetMapping("/health")
@GetMapping({"/health", "/"})
public String health() {
return "Application Health Good!";
}
Expand Down

This file was deleted.

Loading
Loading