Skip to content

Commit 74b4c17

Browse files
committed
fix: error
1 parent dc9285b commit 74b4c17

2 files changed

Lines changed: 52 additions & 53 deletions

File tree

src/main/java/org/scoula/config/RootConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"org.scoula.chapi.scheduler"
3636
})
3737
@Log4j2
38-
@PropertySource({"classpath:application.properties", "classpath:secrets.properties"})
38+
@PropertySource({"classpath:application.properties"})
3939
@MapperScan(basePackages = {"org.scoula.**.mapper"})
4040
@ComponentScan(basePackages = {
4141
"org.scoula", // 전체 스캔

src/main/resources/org/scoula/lh/danzi/mapper/PersonalSummaryMapper.xml

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
55
<mapper namespace="org.scoula.lh.danzi.mapper.PersonalSummaryMapper">
66

7-
<!-- 결과 매핑: 중첩 DTO + Map 키 매핑 -->
87
<resultMap id="PersonalizedCardMap" type="org.scoula.lh.danzi.dto.http.PersonalizedCardDTO">
98
<result property="userId" column="user_id"/>
109
<result property="danziId" column="danzi_id"/>
@@ -16,66 +15,67 @@
1615
<result property="overallStatus" column="overall_status"/>
1716
<result property="homelessStatus" column="homeless_status"/>
1817
<result property="incomeStatus" column="income_status"/>
19-
<result property="assetStatus" column="asset_status"/>
20-
<result property="carStatus" column="car_status"/>
18+
19+
<!-- DTO 필드명은 그대로, 컬럼만 변경 매핑 -->
20+
<result property="assetStatus" column="total_assets_status"/>
21+
<result property="carStatus" column="car_value_status"/>
22+
23+
<!-- JSON -->
2124
<result property="types" column="types"
2225
typeHandler="org.scoula.summary.parsing.JsonStringListTypeHandler"/>
23-
<!-- notes(JSON) -->
2426
<result property="notes" column="notes"
2527
typeHandler="org.scoula.summary.parsing.JsonStringListTypeHandler"/>
2628
</association>
2729
</resultMap>
2830

29-
<!-- 공통 컬럼 -->
31+
<!-- 실제 존재하는 컬럼만 -->
3032
<sql id="personalizedCardColumns">
31-
user_id,
32-
danzi_id,
33-
overall_status,
34-
homeless_status,
35-
income_status,
36-
asset_status,
37-
car_status,
38-
notes,
39-
types,
40-
created_at,
41-
updated_at
33+
user_id,
34+
danzi_id,
35+
types,
36+
overall_status,
37+
homeless_status,
38+
income_status,
39+
total_assets_status,
40+
car_value_status,
41+
notes,
42+
created_at,
43+
updated_at
4244
</sql>
4345

46+
<!-- UPSERT -->
47+
<insert id="upsert" parameterType="org.scoula.lh.danzi.dto.http.PersonalizedCardDTO">
48+
INSERT INTO personalized_card
49+
(user_id,
50+
danzi_id,
51+
overall_status,
52+
homeless_status,
53+
income_status,
54+
total_assets_status,
55+
car_value_status,
56+
types,
57+
notes)
58+
VALUES
59+
(#{userId},
60+
#{danziId},
61+
#{eligibilityResultDTO.overallStatus},
62+
#{eligibilityResultDTO.homelessStatus},
63+
#{eligibilityResultDTO.incomeStatus},
64+
#{eligibilityResultDTO.assetStatus},
65+
#{eligibilityResultDTO.carStatus},
66+
#{eligibilityResultDTO.types, typeHandler=org.scoula.summary.parsing.JsonStringListTypeHandler},
67+
#{eligibilityResultDTO.notes, typeHandler=org.scoula.summary.parsing.JsonStringListTypeHandler})
68+
ON DUPLICATE KEY UPDATE
69+
overall_status = VALUES(overall_status),
70+
homeless_status = VALUES(homeless_status),
71+
income_status = VALUES(income_status),
72+
total_assets_status = VALUES(total_assets_status),
73+
car_value_status = VALUES(car_value_status),
74+
types = VALUES(types),
75+
notes = VALUES(notes),
76+
updated_at = CURRENT_TIMESTAMP
77+
</insert>
4478

45-
46-
<insert id="upsert" parameterType="org.scoula.lh.danzi.dto.http.PersonalizedCardDTO">
47-
INSERT INTO personalized_card
48-
(user_id,
49-
danzi_id,
50-
overall_status,
51-
homeless_status,
52-
income_status,
53-
asset_status,
54-
car_status,
55-
types,
56-
notes)
57-
VALUES (#{userId},
58-
#{danziId},
59-
#{eligibilityResultDTO.overallStatus},
60-
#{eligibilityResultDTO.homelessStatus},
61-
#{eligibilityResultDTO.incomeStatus},
62-
#{eligibilityResultDTO.assetStatus},
63-
#{eligibilityResultDTO.carStatus},
64-
#{eligibilityResultDTO.types, typeHandler=org.scoula.summary.parsing.JsonStringListTypeHandler},
65-
#{eligibilityResultDTO.notes, typeHandler=org.scoula.summary.parsing.JsonStringListTypeHandler})
66-
ON DUPLICATE KEY UPDATE overall_status = VALUES(overall_status),
67-
homeless_status = VALUES(homeless_status),
68-
income_status = VALUES(income_status),
69-
asset_status = VALUES(asset_status),
70-
car_status = VALUES(car_status),
71-
notes = VALUES(notes),
72-
types = values(types),
73-
updated_at = CURRENT_TIMESTAMP
74-
</insert>
75-
76-
77-
78-
<!-- 단건 조회: userId + danziId -->
7979
<select id="get" resultMap="PersonalizedCardMap" parameterType="map">
8080
SELECT
8181
<include refid="personalizedCardColumns"/>
@@ -85,12 +85,11 @@
8585
LIMIT 1
8686
</select>
8787

88-
<!-- UserId 로 조회 -->
8988
<select id="getAllByUserId" resultMap="PersonalizedCardMap" parameterType="int">
9089
SELECT
9190
<include refid="personalizedCardColumns"/>
9291
FROM personalized_card
93-
WHERE user_id = #{userId}
92+
WHERE user_id = #{_parameter}
9493
ORDER BY updated_at DESC
9594
</select>
9695

0 commit comments

Comments
 (0)