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

main 브랜치 dev 브랜치 병합 #16

Merged
merged 4 commits into from
Sep 10, 2023
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
[Refactor] : yml 기본 파일 생성, queryDsl ignore 해제
elyudwo committed Sep 9, 2023
commit 237e5a8da7a15b82e152ddb9fb50fb1ff4d7516b
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
HELP.md
.gradle
build/

!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
build/classes
build/libs
build/resources
build/tmp

!build/libs

*/**/generated/

*.yml
!application.yml
!application-prod.yml
!deploy.yml

1 change: 1 addition & 0 deletions build/bootJarMainClassName
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
kr.co.studyhubinu.studyhubserver.StudyHubServerApplication
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package kr.co.studyhubinu.studyhubserver.bookmark.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;


/**
* QBookMarkEntity is a Querydsl query type for BookMarkEntity
*/
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
public class QBookMarkEntity extends EntityPathBase<BookMarkEntity> {

private static final long serialVersionUID = 1763927877L;

public static final QBookMarkEntity bookMarkEntity = new QBookMarkEntity("bookMarkEntity");

public final NumberPath<Long> id = createNumber("id", Long.class);

public final NumberPath<Long> postId = createNumber("postId", Long.class);

public final NumberPath<Long> userId = createNumber("userId", Long.class);

public QBookMarkEntity(String variable) {
super(BookMarkEntity.class, forVariable(variable));
}

public QBookMarkEntity(Path<? extends BookMarkEntity> path) {
super(path.getType(), path.getMetadata());
}

public QBookMarkEntity(PathMetadata metadata) {
super(BookMarkEntity.class, metadata);
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package kr.co.studyhubinu.studyhubserver.common.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;


/**
* QBaseTimeEntity is a Querydsl query type for BaseTimeEntity
*/
@Generated("com.querydsl.codegen.DefaultSupertypeSerializer")
public class QBaseTimeEntity extends EntityPathBase<BaseTimeEntity> {

private static final long serialVersionUID = 507017890L;

public static final QBaseTimeEntity baseTimeEntity = new QBaseTimeEntity("baseTimeEntity");

public final DateTimePath<java.time.LocalDateTime> createdDate = createDateTime("createdDate", java.time.LocalDateTime.class);

public final DateTimePath<java.time.LocalDateTime> modifiedDate = createDateTime("modifiedDate", java.time.LocalDateTime.class);

public QBaseTimeEntity(String variable) {
super(BaseTimeEntity.class, forVariable(variable));
}

public QBaseTimeEntity(Path<? extends BaseTimeEntity> path) {
super(path.getType(), path.getMetadata());
}

public QBaseTimeEntity(PathMetadata metadata) {
super(BaseTimeEntity.class, metadata);
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package kr.co.studyhubinu.studyhubserver.study.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;


/**
* QAlarmEntity is a Querydsl query type for AlarmEntity
*/
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
public class QAlarmEntity extends EntityPathBase<AlarmEntity> {

private static final long serialVersionUID = 873663913L;

public static final QAlarmEntity alarmEntity = new QAlarmEntity("alarmEntity");

public final kr.co.studyhubinu.studyhubserver.common.domain.QBaseTimeEntity _super = new kr.co.studyhubinu.studyhubserver.common.domain.QBaseTimeEntity(this);

public final EnumPath<kr.co.studyhubinu.studyhubserver.study.enums.AlarmCategoryType> alarmCategory = createEnum("alarmCategory", kr.co.studyhubinu.studyhubserver.study.enums.AlarmCategoryType.class);

//inherited
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;

public final NumberPath<Long> Id = createNumber("Id", Long.class);

//inherited
public final DateTimePath<java.time.LocalDateTime> modifiedDate = _super.modifiedDate;

public final NumberPath<Long> postId = createNumber("postId", Long.class);

public final StringPath title = createString("title");

public QAlarmEntity(String variable) {
super(AlarmEntity.class, forVariable(variable));
}

public QAlarmEntity(Path<? extends AlarmEntity> path) {
super(path.getType(), path.getMetadata());
}

public QAlarmEntity(PathMetadata metadata) {
super(AlarmEntity.class, metadata);
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package kr.co.studyhubinu.studyhubserver.study.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;


/**
* QStudyEntity is a Querydsl query type for StudyEntity
*/
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
public class QStudyEntity extends EntityPathBase<StudyEntity> {

private static final long serialVersionUID = -1337579743L;

public static final QStudyEntity studyEntity = new QStudyEntity("studyEntity");

public final StringPath chatRoomUrl = createString("chatRoomUrl");

public final StringPath content = createString("content");

public final NumberPath<Long> id = createNumber("id", Long.class);

public final StringPath interest = createString("interest");

public final StringPath name = createString("name");

public final DatePath<java.time.LocalDate> studyEndDate = createDate("studyEndDate", java.time.LocalDate.class);

public final DatePath<java.time.LocalDate> studyStartDate = createDate("studyStartDate", java.time.LocalDate.class);

public final NumberPath<Long> userId = createNumber("userId", Long.class);

public QStudyEntity(String variable) {
super(StudyEntity.class, forVariable(variable));
}

public QStudyEntity(Path<? extends StudyEntity> path) {
super(path.getType(), path.getMetadata());
}

public QStudyEntity(PathMetadata metadata) {
super(StudyEntity.class, metadata);
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
package kr.co.studyhubinu.studyhubserver.study.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;
import com.querydsl.core.types.dsl.PathInits;


/**
* QStudyPostEntity is a Querydsl query type for StudyPostEntity
*/
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
public class QStudyPostEntity extends EntityPathBase<StudyPostEntity> {

private static final long serialVersionUID = -444406559L;

private static final PathInits INITS = PathInits.DIRECT2;

public static final QStudyPostEntity studyPostEntity = new QStudyPostEntity("studyPostEntity");

public final kr.co.studyhubinu.studyhubserver.common.domain.QBaseTimeEntity _super = new kr.co.studyhubinu.studyhubserver.common.domain.QBaseTimeEntity(this);

public final StringPath chatUrl = createString("chatUrl");

public final StringPath content = createString("content");

//inherited
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;

public final EnumPath<kr.co.studyhubinu.studyhubserver.user.enums.GenderType> filteredGender = createEnum("filteredGender", kr.co.studyhubinu.studyhubserver.user.enums.GenderType.class);

public final NumberPath<Long> id = createNumber("id", Long.class);

public final EnumPath<kr.co.studyhubinu.studyhubserver.user.enums.MajorType> major = createEnum("major", kr.co.studyhubinu.studyhubserver.user.enums.MajorType.class);

//inherited
public final DateTimePath<java.time.LocalDateTime> modifiedDate = _super.modifiedDate;

public final NumberPath<Integer> penalty = createNumber("penalty", Integer.class);

public final DatePath<java.time.LocalDate> studyEndDate = createDate("studyEndDate", java.time.LocalDate.class);

public final NumberPath<Integer> studyPerson = createNumber("studyPerson", Integer.class);

public final DatePath<java.time.LocalDate> studyStartDate = createDate("studyStartDate", java.time.LocalDate.class);

public final EnumPath<kr.co.studyhubinu.studyhubserver.study.enums.StudyWayType> studyWay = createEnum("studyWay", kr.co.studyhubinu.studyhubserver.study.enums.StudyWayType.class);

public final StringPath title = createString("title");

public final kr.co.studyhubinu.studyhubserver.user.domain.QUserEntity user;

public QStudyPostEntity(String variable) {
this(StudyPostEntity.class, forVariable(variable), INITS);
}

public QStudyPostEntity(Path<? extends StudyPostEntity> path) {
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
}

public QStudyPostEntity(PathMetadata metadata) {
this(metadata, PathInits.getFor(metadata, INITS));
}

public QStudyPostEntity(PathMetadata metadata, PathInits inits) {
this(StudyPostEntity.class, metadata, inits);
}

public QStudyPostEntity(Class<? extends StudyPostEntity> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.user = inits.isInitialized("user") ? new kr.co.studyhubinu.studyhubserver.user.domain.QUserEntity(forProperty("user")) : null;
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package kr.co.studyhubinu.studyhubserver.user.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;
import com.querydsl.core.types.dsl.PathInits;


/**
* QInterestEntity is a Querydsl query type for InterestEntity
*/
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
public class QInterestEntity extends EntityPathBase<InterestEntity> {

private static final long serialVersionUID = 1730780142L;

private static final PathInits INITS = PathInits.DIRECT2;

public static final QInterestEntity interestEntity = new QInterestEntity("interestEntity");

public final NumberPath<Long> id = createNumber("id", Long.class);

public final StringPath name = createString("name");

public final kr.co.studyhubinu.studyhubserver.study.domain.QStudyPostEntity studyPostEntity;

public final QUserEntity user;

public QInterestEntity(String variable) {
this(InterestEntity.class, forVariable(variable), INITS);
}

public QInterestEntity(Path<? extends InterestEntity> path) {
this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
}

public QInterestEntity(PathMetadata metadata) {
this(metadata, PathInits.getFor(metadata, INITS));
}

public QInterestEntity(PathMetadata metadata, PathInits inits) {
this(InterestEntity.class, metadata, inits);
}

public QInterestEntity(Class<? extends InterestEntity> type, PathMetadata metadata, PathInits inits) {
super(type, metadata, inits);
this.studyPostEntity = inits.isInitialized("studyPostEntity") ? new kr.co.studyhubinu.studyhubserver.study.domain.QStudyPostEntity(forProperty("studyPostEntity"), inits.get("studyPostEntity")) : null;
this.user = inits.isInitialized("user") ? new QUserEntity(forProperty("user")) : null;
}

}

Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package kr.co.studyhubinu.studyhubserver.user.domain;

import static com.querydsl.core.types.PathMetadataFactory.*;

import com.querydsl.core.types.dsl.*;

import com.querydsl.core.types.PathMetadata;
import javax.annotation.processing.Generated;
import com.querydsl.core.types.Path;


/**
* QUserEntity is a Querydsl query type for UserEntity
*/
@Generated("com.querydsl.codegen.DefaultEntitySerializer")
public class QUserEntity extends EntityPathBase<UserEntity> {

private static final long serialVersionUID = 228813903L;

public static final QUserEntity userEntity = new QUserEntity("userEntity");

public final kr.co.studyhubinu.studyhubserver.common.domain.QBaseTimeEntity _super = new kr.co.studyhubinu.studyhubserver.common.domain.QBaseTimeEntity(this);

//inherited
public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;

public final StringPath email = createString("email");

public final EnumPath<kr.co.studyhubinu.studyhubserver.user.enums.GenderType> gender = createEnum("gender", kr.co.studyhubinu.studyhubserver.user.enums.GenderType.class);

public final NumberPath<Long> id = createNumber("id", Long.class);

public final EnumPath<kr.co.studyhubinu.studyhubserver.user.enums.MajorType> major = createEnum("major", kr.co.studyhubinu.studyhubserver.user.enums.MajorType.class);

//inherited
public final DateTimePath<java.time.LocalDateTime> modifiedDate = _super.modifiedDate;

public final StringPath nickname = createString("nickname");

public final StringPath password = createString("password");

public QUserEntity(String variable) {
super(UserEntity.class, forVariable(variable));
}

public QUserEntity(Path<? extends UserEntity> path) {
super(path.getType(), path.getMetadata());
}

public QUserEntity(PathMetadata metadata) {
super(UserEntity.class, metadata);
}

}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
@@ -12,13 +13,12 @@
import org.springframework.data.redis.serializer.StringRedisSerializer;

@Configuration
@PropertySource(value = "application-prod.yml")
public class RedisConfig {

@Value("${spring.redis.host}")
private String redisHost;
private String redisHost = "studyhub-redis.reoorm.ng.0001.apn2.cache.amazonaws.com";

@Value("${spring.redis.port}")
private String redisPort;
private String redisPort = "6379";

@Bean
public RedisConnectionFactory redisConnectionFactory() {
4 changes: 4 additions & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
spring:
profiles:
active:
- prod