Merge pull request #76 from StuBee2/Refactor/#74

Refactor/#74
StuBee2 · Jan 15, 2024 · 21ca650 · 21ca650
2 parents da18fd8 + 246c287
commit 21ca650
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/...g-adapter/jpa-mysql/src/main/java/rolling/jpamysql/company/CompanyQueryDSLRepository.java b/...g-adapter/jpa-mysql/src/main/java/rolling/jpamysql/company/CompanyQueryDSLRepository.java
@@ -75,7 +75,7 @@ private List<CompanyJPAEntity> findByOptionWithPaging(Predicate option, PageRequ
                 .selectFrom(companyJPAEntity)
                 .where(option)
                 .orderBy(companyJPAEntity.createdAt.desc())
-                .offset(pageRequest.page())
+                .offset((pageRequest.page()-1)*pageRequest.size())
                 .limit(pageRequest.size())
                 .fetch();
     }
@@ -84,7 +84,7 @@ List<CompanyJPAEntity> findAll(PageRequest pageRequest) {
         return jpaQueryFactory
                 .selectFrom(companyJPAEntity)
                 .where(companyJPAEntity.companyStatus.eq(CompanyStatus.ACCEPTED))
-                .offset(pageRequest.page())
+                .offset((pageRequest.page()-1)*pageRequest.size())
                 .limit(pageRequest.size())
                 .fetch();
     }

diff --git a/rolling-adapter/security/src/main/java/rolling/security/jwt/JwtProperties.java b/rolling-adapter/security/src/main/java/rolling/security/jwt/JwtProperties.java
@@ -13,7 +13,7 @@ class JwtProperties {
 
     private String accessKey;
     private String secretKey;
-    private long accessExpire;
-    private long refreshExpire;
+    private String accessExpire;
+    private String refreshExpire;
 
 }
diff --git a/rolling-adapter/security/src/main/java/rolling/security/jwt/ProvideJwtAdapter.java b/rolling-adapter/security/src/main/java/rolling/security/jwt/ProvideJwtAdapter.java
@@ -23,7 +23,7 @@ public String generateAccessToken(final Long id, final MemberRole memberRole) {
                 .setSubject(id.toString())
                 .claim("authority", memberRole)
                 .setIssuedAt(new Date())
-                .setExpiration(new Date(System.currentTimeMillis() + jwtProperties.getAccessExpire()))
+                .setExpiration(new Date(System.currentTimeMillis() + Long.parseLong(jwtProperties.getAccessExpire())))
                 .signWith(SignatureAlgorithm.HS512, jwtProperties.getAccessKey())
                 .compact();
     }
@@ -35,7 +35,7 @@ public String generateRefreshToken(final Long id, final MemberRole memberRole) {
                 .setSubject(id.toString())
                 .claim("authority", memberRole)
                 .setIssuedAt(new Date())
-                .setExpiration(new Date(System.currentTimeMillis() + jwtProperties.getRefreshExpire()))
+                .setExpiration(new Date(System.currentTimeMillis() + Long.parseLong(jwtProperties.getRefreshExpire())))
                 .signWith(SignatureAlgorithm.HS512, jwtProperties.getSecretKey())
                 .compact();
     }

diff --git a/...cation/src/main/java/rolling/application/story/interactor/command/ModifyStoryUseCase.java b/...cation/src/main/java/rolling/application/story/interactor/command/ModifyStoryUseCase.java
@@ -28,7 +28,7 @@ public void modify(final ModifyStoryCommand command) {
 
         story.modify(employmentDetails, corporationDetails, reviewGrades, memberSessionPort.currentId());
 
-        commandStoryPort.save(story);
+        commandStoryPort.update(story);
     }
 
 }
diff --git a/...e/application/src/main/java/rolling/application/story/interactor/command/StoryMapper.java b/...e/application/src/main/java/rolling/application/story/interactor/command/StoryMapper.java
@@ -60,7 +60,7 @@ static CorporationDetails toCorporationDetails(final ModifyStoryCommand command)
     }
 
     static ReviewGrades toReviewGrades(final ModifyStoryCommand command) {
-        return ReviewGrades.builder()
+        return ReviewGrades.ExceptTotalBuilder()
                 .salaryAndBenefits(Double.valueOf(command.salaryAndBenefits()))
                 .workLifeBalance(Double.valueOf(command.workLifeBalance()))
                 .organizationalCulture(Double.valueOf(command.organizationalCulture()))

diff --git a/rolling-core/domain/src/main/java/rolling/domain/story/model/ReviewGrades.java b/rolling-core/domain/src/main/java/rolling/domain/story/model/ReviewGrades.java
@@ -5,6 +5,11 @@
 
 public final class ReviewGrades extends Grades {
 
+    @Builder(builderClassName = "ExceptTotalBuilder", builderMethodName = "ExceptTotalBuilder")
+    public ReviewGrades(Double salaryAndBenefits, Double workLifeBalance, Double organizationalCulture, Double careerAdvancement) {
+        super(salaryAndBenefits, workLifeBalance, organizationalCulture, careerAdvancement);
+    }
+
     @Builder
     public ReviewGrades(Double total, Double salaryAndBenefits, Double workLifeBalance, Double organizationalCulture, Double careerAdvancement) {
         super(total, salaryAndBenefits, workLifeBalance, organizationalCulture, careerAdvancement);