Skip to content

Commit b4f266f

Browse files
fix errors
1 parent 8d4e21a commit b4f266f

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

backend/src/main/java/com/caesarjlee/caesarfinancialtracker/entities/ProfileEntity.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
@NoArgsConstructor
1414
@Builder
1515
public class ProfileEntity {
16-
@Id @GeneratedValue(strategy = GenerationType.IDENTITY) Long id;
17-
@Column(name = "first_name")private String firstName;
18-
@Column(name = "last_name")private String lastName;
19-
@Column(unique = true) private String email;
20-
private String password;
21-
@Column(name = "profile_image")private String profileImage;
22-
@Column(name = "created_at", updatable = false) @CreationTimestamp LocalDateTime createdAt;
23-
@Column(name = "updated_at")@UpdateTimestamp LocalDateTime updatedAt;
16+
@Id @GeneratedValue(strategy = GenerationType.IDENTITY) Long id;
17+
@Column(name = "first_name")private String firstName;
18+
@Column(name = "last_name")private String lastName;
19+
@Column(unique = true) private String email;
20+
private String password;
21+
@Column(name = "profile_image", columnDefinition = "TEXT")
22+
private String profileImage;
23+
@Column(name = "created_at", updatable = false) @CreationTimestamp LocalDateTime createdAt;
24+
@Column(name = "updated_at")@UpdateTimestamp LocalDateTime updatedAt;
2425
}

backend/src/main/java/com/caesarjlee/caesarfinancialtracker/enumerations/CategoryOrders.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
public enum CategoryOrders {
1010
NAME_ASCENDING (Sort.by(Sort.Direction.ASC, "name")),
1111
NAME_DESCENDING (Sort.by(Sort.Direction.DESC, "name")),
12-
CREATED_ASCENDING (Sort.by(Sort.Direction.ASC, "created_at")),
13-
CREATED_DESCENDING (Sort.by(Sort.Direction.DESC, "created_at")),
14-
UPDATED_ASCENDING (Sort.by(Sort.Direction.ASC, "updated_at")),
15-
UPDATED_DESCENDING (Sort.by(Sort.Direction.DESC, "updated_at"));
12+
CREATED_ASCENDING (Sort.by(Sort.Direction.ASC, "createdAt")),
13+
CREATED_DESCENDING (Sort.by(Sort.Direction.DESC, "createdAt")),
14+
UPDATED_ASCENDING (Sort.by(Sort.Direction.ASC, "updatedAt")),
15+
UPDATED_DESCENDING (Sort.by(Sort.Direction.DESC, "updatedAt"));
1616

1717
private final Sort sort;
1818
}

backend/src/main/java/com/caesarjlee/caesarfinancialtracker/enumerations/RecordOrders.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ public enum RecordOrders {
1313
DATE_DESCENDING (Sort.by(Sort.Direction.DESC, "date")),
1414
PRICE_ASCENDING (Sort.by(Sort.Direction.ASC, "price")),
1515
PRICE_DESCENDING (Sort.by(Sort.Direction.DESC, "price")),
16-
CREATED_ASCENDING (Sort.by(Sort.Direction.ASC, "created_at")),
17-
CREATED_DESCENDING (Sort.by(Sort.Direction.DESC, "created_at")),
18-
UPDATED_ASCENDING (Sort.by(Sort.Direction.ASC, "updated_at")),
19-
UPDATED_DESCENDING (Sort.by(Sort.Direction.DESC, "updated_at"));
16+
CREATED_ASCENDING (Sort.by(Sort.Direction.ASC, "createdAt")),
17+
CREATED_DESCENDING (Sort.by(Sort.Direction.DESC, "createdAt")),
18+
UPDATED_ASCENDING (Sort.by(Sort.Direction.ASC, "updatedAt")),
19+
UPDATED_DESCENDING (Sort.by(Sort.Direction.DESC, "updatedAt"));
2020

2121
private final Sort sort;
2222
}

backend/src/main/java/com/caesarjlee/caesarfinancialtracker/repositories/CategoryRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ SELECT EXISTS(
5353
SELECT c FROM CategoryEntity c
5454
WHERE c.profile.id = :profileId
5555
AND (:type IS NULL OR c.type = :type)
56-
AND (:name IS NULL OR LOWER(c.name) LIKE LOWER(CONCAT('%', :name, '%')))
56+
AND (:keyword IS NULL OR LOWER(c.name) LIKE LOWER(CONCAT('%', :keyword, '%')))
5757
"""
5858
)
5959
Page <CategoryEntity> search(@Param("profileId") Long profileId, @Param("type") String type,

backend/src/main/java/com/caesarjlee/caesarfinancialtracker/repositories/RecordRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public interface RecordRepository extends JpaRepository <RecordEntity, Long> {
3939
"""
4040
SELECT r FROM RecordEntity r
4141
WHERE r.profile.id = :profileId
42-
AND (:name IS NULL OR LOWER(r.name) LIKE LOWER(CONCAT('%', :name, '%')))
42+
AND (:keyword IS NULL OR LOWER(r.name) LIKE LOWER(CONCAT('%', :keyword, '%')))
4343
AND (:type IS NULL OR r.category.type = :type)
4444
AND (:categoryId IS NULL OR r.category.id = :categoryId)
4545
AND (:dateStart IS NULL OR r.date >= :dateStart)
@@ -80,7 +80,7 @@ Page<RecordEntity> search(@Param("profileId") Long profileId,
8080
AND (:priceHigh IS NULL OR r.price <= :priceHigh)
8181
AND (:#{#categories == null || #categories.isEmpty()} = true
8282
OR r.category.id IN :categories)
83-
AND (:name IS NULL OR LOWER(r.name) LIKE LOWER(CONCAT('%', :name, '%')))
83+
AND (:keyword IS NULL OR LOWER(r.name) LIKE LOWER(CONCAT('%', :keyword, '%')))
8484
"""
8585
)
8686
List <RecordEntity> searchAll(@Param("profileId") Long profileId,

0 commit comments

Comments
 (0)