-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/storeDetail' into feature/registerStore
- Loading branch information
Showing
60 changed files
with
844 additions
and
521 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/java/com/mpnp/baechelin/bookmark/repository/FolderRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
src/main/java/com/mpnp/baechelin/config/QuerydslConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.mpnp.baechelin.config; | ||
|
|
||
| import com.querydsl.core.BooleanBuilder; | ||
| import com.querydsl.jpa.impl.JPAQueryFactory; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| import javax.persistence.EntityManager; | ||
| import javax.persistence.PersistenceContext; | ||
| import java.math.BigDecimal; | ||
|
|
||
| import static com.mpnp.baechelin.store.domain.QStore.store; | ||
|
|
||
| @Configuration | ||
| public class QuerydslConfig { | ||
|
|
||
| @PersistenceContext | ||
| private EntityManager entityManager; | ||
|
|
||
| @Bean | ||
| public JPAQueryFactory jpaQueryFactory() { | ||
| return new JPAQueryFactory(entityManager); | ||
| } | ||
|
|
||
| public static BooleanBuilder locationBuilder(BigDecimal latStart, BigDecimal latEnd, BigDecimal lngStart, BigDecimal lngEnd) { | ||
| BooleanBuilder builder = new BooleanBuilder(); | ||
| builder.and(latStart == null ? null : store.latitude.goe(latStart)); | ||
| builder.and(latEnd == null ? null : store.latitude.loe(latEnd)); | ||
| builder.and(lngStart == null ? null : store.longitude.goe(lngStart)); | ||
| builder.and(lngEnd == null ? null : store.longitude.loe(lngEnd)); | ||
| return builder; | ||
| } | ||
| } |
20 changes: 0 additions & 20 deletions
20
src/main/java/com/mpnp/baechelin/config/QuerydslConfiguration.java
This file was deleted.
Oops, something went wrong.
39 changes: 39 additions & 0 deletions
39
src/main/java/com/mpnp/baechelin/config/SwaggerConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package com.mpnp.baechelin.config; | ||
|
|
||
|
|
||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import springfox.documentation.builders.ApiInfoBuilder; | ||
| import springfox.documentation.builders.PathSelectors; | ||
| import springfox.documentation.builders.RequestHandlerSelectors; | ||
| import springfox.documentation.service.ApiInfo; | ||
| import springfox.documentation.spi.DocumentationType; | ||
| import springfox.documentation.spring.web.plugins.Docket; | ||
| import springfox.documentation.swagger2.annotations.EnableSwagger2; | ||
|
|
||
| @Configuration | ||
| @EnableSwagger2 | ||
| public class SwaggerConfig { | ||
|
|
||
| private static final String API_NAME = "Baechelin Project API"; | ||
| private static final String API_VERSION = "0.0.1"; | ||
| private static final String API_DESCRIPTION = "Baechelin 프로젝트 명세서"; | ||
|
|
||
| @Bean | ||
| public Docket api() { | ||
| return new Docket(DocumentationType.SWAGGER_2) | ||
| .apiInfo(apiInfo()) | ||
| .select() | ||
| .apis(RequestHandlerSelectors.any()) | ||
| .paths(PathSelectors.any()) | ||
| .build(); | ||
| } | ||
|
|
||
| public ApiInfo apiInfo() { | ||
| return new ApiInfoBuilder() | ||
| .title(API_NAME) | ||
| .version(API_VERSION) | ||
| .description(API_DESCRIPTION) | ||
| .build(); | ||
| } | ||
| } |
Oops, something went wrong.