Develop

.github/workflows/deploy.yml

@@ -22,11 +22,9 @@ jobs:
         uses: akhileshns/heroku-deploy@v3.12.12
         with:
           heroku_api_key: 5fcb9b2b-db25-41f5-80b1-c1da5f3fbd1d
-          heroku_app_name: ${{secrets.HEROKU_APP_NAME}}
+          heroku_app_name: bebeshare-deploy
           heroku_email: blood_nail@naver.com
 
 
 
 
-
-

.gitignore

@@ -3,7 +3,7 @@
 
 ### Java ###
 # Compiled class file
-*.class
+*.class 
 out/
 InitClass.java
 .idea
@@ -30,4 +30,6 @@ InitClass.java
 hs_err_pid*
 replay_pid*
 
-# End of https://www.toptal.com/developers/gitignore/api/java
+# End of https://www.toptal.com/developers/gitignore/api/java
+
+.gradle

Procfile

@@ -1 +1 @@
-web java -Dserver.port=$PORT $JAVA_OPTS -Dspring.profiles.active=prod -jar build/libs/7th-bebeShare-0.0.1-SNAPSHOT.jar'
+web java -Dserver.port=$PORT $JAVA_OPTS -Dspring.profiles.active=prod -jar build/libs/bebeshare-deploy.jar

README.md

@@ -1,26 +1,74 @@
-1. 프로젝트 Description
+# 무료 나눔 플랫폼 - bebeShare - 💓 
+<br>
 
-- bebeShare
+### 배포 링크 🔗 [https://bebeshare-deploy.herokuapp.com/](https://bebeshare-deploy.herokuapp.com/)
+### API 링크 🔗 
+### Github 링크 🔗 [https://github.com/Couch-Coders/7th-bebeShare](https://github.com/Couch-Coders/7th-bebeShare)   
+<br>
 
-- 안쓰는 육아용품을 서로 무료로 나눔 하는 웹사이트. 가입한 유저들은 나눔할 육아용품을 올리고 나눔받을 사람을 찾는다.
+### 육아용품 무료 나눔 웹사이트 
 
+## ver.01
+### :baby_bottle: 사용하지 않는 육아용품을 나눔하고 나눔받을 수 있는 서비스
+> - 나눔을 희망하는 유저(쉐어)는 육아용품을 게시하고 나눔할 수 있습니다
+> - 나눔받기를 희망하는 유저(베베)는 댓글을 통해 나눔받기 신청을 할 수 있습니다
+> - 댓글을 통해 해당 물품을 나눔 받을 수 있습니다
 
-- 댓글을 통해 나눔의사를 밝히고 해당 물품을 나눔 받는다.
+### :three: 나눔받기 횟수의 제한
+> - 유저는 일정기간 제한된 나눔받기 횟수만큼 나눔을 받을 수 있습니다
+> - 제공된 나눔받기 횟수를 모두 소진하더라도 나눔을 할 경우 나눔횟수가 추가됩니다
+> - 나눔하기 횟수는 제한이 없습니다
 
+### :heavy_check_mark: 관심목록 찜 기능
+> - 베베는 상품 상세 페이지에서 상품을 찜할 수 있습니다
 
-2. 프로젝트 정보 (ver 0.1)
+### :alarm_clock: 알림을 통해 내가 업로드한 상품을 찜한 회원 확인
+> - 쉐어가 업로드한 상품을 베베가 찜하면 쉐어는 알림을 통해 확인할 수 있습니다 
 
-- 현재 프로젝트는 상품나눔 게시글 작성 , 댓글을 통한 서로 나눔
-- 마이페이지 나눔 받을 횟수 , 나눔 한 횟수 , 나눔받을수 있는 횟수 대략 적인정보.
-- 나눔내역 나눔받은 내역 , 찜목록 , 댓글 목록등을 나타낸다.
-- 우선 기본적인 Default 기능이 완료 되면. 추후 기능을 늘려간다.
+### :family: 마이페이지
+> - 마이페이지에서 나눔내역 횟수, 나눔목록, 찜목록, 댓글 목록을 볼 수 있습니다
 
+## ver.02 추가 예정 기능(희망)
+> - 채팅을 통한 유저간 소통
+> - 알림 기능
+> - 유저들 간의 커뮤니티 기능
 
-- 추후 추가될 기능 (희망)
+<br>
 
-채팅을 통한 유저들의 소통 , 알림 기능 , 유저들 간의 커뮤니티 게시판 목록
+## 👨‍💻 팀원 소개
 
+|                                    [권기준](https://github.com/superkkj)                                    |                                                                         [이태기](https://github.com/TevLee)                                                                          |                                       [홍유진](https://github.com/omnireader0)                                       |                                     
+| :--------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------: | 
+| <img src="https://res.cloudinary.com/divncmfka/image/upload/v1645906082/me_bvddac.jpg" width="150" height="150"> | <img src="https://user-images.githubusercontent.com/69510442/156530657-0bf8a79c-232b-4fd4-b10b-1f2c080d2aa3.png" width="150" height="150"> | <img src="https://res.cloudinary.com/divncmfka/image/upload/v1645950212/%E1%84%89%E1%85%A5%E1%86%AB%E1%84%92%E1%85%B4%E1%84%82%E1%85%B5%E1%86%B7_yr5abm.jpg" width="150" height="150"> | 
+|                                                     BackEnd                                                     |                                                                                        BackEnd                                                                                        |                                                     BackEnd                                                      |
 
+<br>
+
+## :watch:  개발 기간
+- 2022.03.15 ~ 
+
+## 개발 환경
+<p>
+<img src="https://img.shields.io/badge/java-007396?style=flat-square&logo=java&logoColor=white" alt=""/>
+<img src="https://img.shields.io/badge/Spring Boot -6DB33F?style=flat-square&logo=Spring Boot&logoColor=white" alt=""/>
+<img src="https://img.shields.io/badge/SpringSecurity-6DB33F?style=flat-square&logo=SpringSecurity&logoColor=white" alt=""/>
+<img src="https://img.shields.io/badge/JPA-6DB33F?style=flat-square&logo=&logoColor=white" alt=""/>
+<img src="https://img.shields.io/badge/Query DSL-0769AD?style=flat-square&logo=&logoColor=white" alt=""/>
+<img src="https://img.shields.io/badge/MariaDB -4479A1?style=flat-square&logo=MySQL&logoColor=white"/>
+<img src="https://img.shields.io/badge/Oauth-4285F4?style=flat-square&logo=Google&logoColor=white"/>
+</p>
+
+## 인프라
+<p>
+<img src="https://img.shields.io/badge/Heroku -232F3E?style=flat-square&logo=Heroku&logoColor=white" alt=""/>
+<img src="https://img.shields.io/badge/GitHub Actions -2088FF?style=flat-square&logo=GitHub Actions&logoColor=white" alt=""/>
+</p>
+
+## 🛠 기획 및 설계
+- [DB 명세서](https://lean-owner-437.notion.site/DB-dc8f9dfa82504658b3324594b1e9f214)  
+![db800x715](https://user-images.githubusercontent.com/48271665/162228879-9fa529cc-c351-4397-92c7-673392d27cbf.png)
+
+- [API 명세서](https://lean-owner-437.notion.site/API-90cc212689ad4070b10fa83f822301bf)
 
 
 

build.gradle

@@ -39,16 +39,20 @@ repositories {
 }
 
 dependencies {
+    implementation group: 'com.google.firebase', name: 'firebase-admin', version: '8.0.1'
+
     implementation('org.springframework.boot:spring-boot-starter-web')
     implementation 'junit:junit:4.13.1'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     testImplementation('org.springframework.boot:spring-boot-starter-test')
 
-    implementation('org.projectlombok:lombok:1.18.10')
-    annotationProcessor('org.projectlombok:lombok:1.18.10')
+    implementation('org.projectlombok:lombok:1.18.20')
+    annotationProcessor('org.projectlombok:lombok:1.18.20')
 
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client'
+    implementation group: 'org.postgresql', name: 'postgresql', version: '42.3.3'
+
 
     implementation('org.springframework.boot:spring-boot-starter-mustache')
 
@@ -70,9 +74,21 @@ dependencies {
 
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
 
-
-
-
+    //websocket
+    implementation 'org.springframework.boot:spring-boot-starter-websocket'
+    implementation 'org.webjars:sockjs-client:1.1.2'
+    implementation 'org.webjars:stomp-websocket:2.3.3-1'
+
+    //view
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
+    implementation 'org.springframework.boot:spring-boot-starter-freemarker'
+    implementation 'org.springframework.boot:spring-boot-devtools'
+    implementation 'org.webjars.bower:bootstrap:4.3.1'
+    implementation 'org.webjars.bower:vue:2.5.16'
+    implementation 'org.webjars.bower:axios:0.17.1'
+    implementation 'com.google.code.gson:gson:2.8.0'
+    runtimeOnly 'com.h2database:h2'
 }
 
 
@@ -95,4 +111,13 @@ configurations {
     }
     querydsl.extendsFrom compileClasspath
 }
-//querydsl 추가 끝
+/** * comileQuerydsl.doFirst 추가 */ 
+// compileQuerydsl.doFirst {
+//      if(file(querydslDir).exists()) 
+//         delete(file(querydslDir)) 
+// }
+//querydsl 추가 끝
+bootJar {
+    archivesBaseName='bebeshare-deploy'
+    archiveFileName='bebeshare-deploy.jar'
+}

build/generated/querydsl/bebeShare/QBaseEntity.java

@@ -0,0 +1,43 @@
+package bebeShare;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QBaseEntity is a Querydsl query type for BaseEntity
+ */
+@Generated("com.querydsl.codegen.DefaultSupertypeSerializer")
+public class QBaseEntity extends EntityPathBase<BaseEntity> {
+
+    private static final long serialVersionUID = 1239751561L;
+
+    public static final QBaseEntity baseEntity = new QBaseEntity("baseEntity");
+
+    public final DateTimePath<java.time.LocalDateTime> createdDate = createDateTime("createdDate", java.time.LocalDateTime.class);
+
+    public final NumberPath<Long> createedById = createNumber("createedById", Long.class);
+
+    public final NumberPath<Long> modifiedById = createNumber("modifiedById", Long.class);
+
+    public final DateTimePath<java.time.LocalDateTime> modifiedDate = createDateTime("modifiedDate", java.time.LocalDateTime.class);
+
+    public QBaseEntity(String variable) {
+        super(BaseEntity.class, forVariable(variable));
+    }
+
+    public QBaseEntity(Path<? extends BaseEntity> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QBaseEntity(PathMetadata metadata) {
+        super(BaseEntity.class, metadata);
+    }
+
+}
+

build/generated/querydsl/bebeShare/domain/code/QCode.java

@@ -0,0 +1,57 @@
+package bebeShare.domain.code;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QCode is a Querydsl query type for Code
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QCode extends EntityPathBase<Code> {
+
+    private static final long serialVersionUID = 465556057L;
+
+    public static final QCode code1 = new QCode("code1");
+
+    public final bebeShare.QBaseEntity _super = new bebeShare.QBaseEntity(this);
+
+    public final StringPath code = createString("code");
+
+    public final StringPath codeName = createString("codeName");
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
+
+    //inherited
+    public final NumberPath<Long> createedById = _super.createedById;
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    //inherited
+    public final NumberPath<Long> modifiedById = _super.modifiedById;
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> modifiedDate = _super.modifiedDate;
+
+    public final StringPath useYn = createString("useYn");
+
+    public QCode(String variable) {
+        super(Code.class, forVariable(variable));
+    }
+
+    public QCode(Path<? extends Code> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QCode(PathMetadata metadata) {
+        super(Code.class, metadata);
+    }
+
+}
+

build/generated/querydsl/bebeShare/domain/comment/QComment.java

@@ -0,0 +1,74 @@
+package bebeShare.domain.comment;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QComment is a Querydsl query type for Comment
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QComment extends EntityPathBase<Comment> {
+
+    private static final long serialVersionUID = -1348103589L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QComment comment = new QComment("comment");
+
+    public final bebeShare.QBaseEntity _super = new bebeShare.QBaseEntity(this);
+
+    public final StringPath commentContent = createString("commentContent");
+
+    public final StringPath commentStatus = createString("commentStatus");
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
+
+    //inherited
+    public final NumberPath<Long> createedById = _super.createedById;
+
+    public final StringPath deleteYn = createString("deleteYn");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    //inherited
+    public final NumberPath<Long> modifiedById = _super.modifiedById;
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> modifiedDate = _super.modifiedDate;
+
+    public final bebeShare.domain.product.QProduct product;
+
+    public final bebeShare.domain.user.QUser user;
+
+    public QComment(String variable) {
+        this(Comment.class, forVariable(variable), INITS);
+    }
+
+    public QComment(Path<? extends Comment> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QComment(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QComment(PathMetadata metadata, PathInits inits) {
+        this(Comment.class, metadata, inits);
+    }
+
+    public QComment(Class<? extends Comment> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.product = inits.isInitialized("product") ? new bebeShare.domain.product.QProduct(forProperty("product"), inits.get("product")) : null;
+        this.user = inits.isInitialized("user") ? new bebeShare.domain.user.QUser(forProperty("user")) : null;
+    }
+
+}
+