11import { generateUUIDv4 } from '@crowd/common'
22import {
3+ ISecurityInsightsEvaluationAssessment ,
34 ISecurityInsightsEvaluationSuite ,
4- ISecurityInsightsEvaluationSuiteControlEvaluation ,
5- ISecurityInsightsEvaluationSuiteControlEvaluationAssessment ,
5+ ISecurityInsightsEvaluations ,
66 ISecurityInsightsObsoleteRepo ,
77} from '@crowd/types'
88
@@ -102,11 +102,11 @@ export async function findSuiteControlEvaluation(
102102 qx : QueryExecutor ,
103103 repo : string ,
104104 controlId : string ,
105- ) : Promise < ISecurityInsightsEvaluationSuiteControlEvaluation | null > {
105+ ) : Promise < ISecurityInsightsEvaluations | null > {
106106 return await qx . selectOneOrNone (
107107 `
108108 select *
109- from "securityInsightsEvaluationSuiteControlEvaluations "
109+ from "securityInsightsEvaluations "
110110 where "repo" = $(repo) and "controlId" = $(controlId)
111111 ` ,
112112 {
@@ -118,11 +118,11 @@ export async function findSuiteControlEvaluation(
118118
119119export async function addSuiteControlEvaluation (
120120 qx : QueryExecutor ,
121- evaluation : ISecurityInsightsEvaluationSuiteControlEvaluation ,
121+ evaluation : ISecurityInsightsEvaluations ,
122122) : Promise < void > {
123123 await qx . result (
124124 `
125- insert into "securityInsightsEvaluationSuiteControlEvaluations "
125+ insert into "securityInsightsEvaluations "
126126 (
127127 "id",
128128 "securityInsightsEvaluationSuiteId",
@@ -183,14 +183,14 @@ export async function addSuiteControlEvaluation(
183183
184184export async function addControlEvaluationAssessment (
185185 qx : QueryExecutor ,
186- assessment : ISecurityInsightsEvaluationSuiteControlEvaluationAssessment ,
186+ assessment : ISecurityInsightsEvaluationAssessment ,
187187) : Promise < void > {
188188 await qx . result (
189189 `
190- insert into "securityInsightsEvaluationSuiteControlEvaluationAssessments "
190+ insert into "securityInsightsEvaluationAssessments "
191191 (
192192 "id",
193- "securityInsightsEvaluationSuiteControlEvaluationId ",
193+ "securityInsightsEvaluationId ",
194194 "repo",
195195 "insightsProjectId",
196196 "insightsProjectSlug",
@@ -208,7 +208,7 @@ export async function addControlEvaluationAssessment(
208208 values
209209 (
210210 $(id),
211- $(securityInsightsEvaluationSuiteControlEvaluationId ),
211+ $(securityInsightsEvaluationId ),
212212 $(repo),
213213 $(insightsProjectId),
214214 $(insightsProjectSlug),
@@ -223,7 +223,7 @@ export async function addControlEvaluationAssessment(
223223 now(),
224224 now()
225225 )
226- on conflict ("securityInsightsEvaluationSuiteControlEvaluationId ", "repo", "requirementId")
226+ on conflict ("securityInsightsEvaluationId ", "repo", "requirementId")
227227 do update
228228 set "updatedAt" = EXCLUDED."updatedAt",
229229 "applicability" = EXCLUDED."applicability",
@@ -237,8 +237,7 @@ export async function addControlEvaluationAssessment(
237237 ` ,
238238 {
239239 id : generateUUIDv4 ( ) ,
240- securityInsightsEvaluationSuiteControlEvaluationId :
241- assessment . securityInsightsEvaluationSuiteControlEvaluationId ,
240+ securityInsightsEvaluationId : assessment . securityInsightsEvaluationId ,
242241 repo : assessment . repo ,
243242 insightsProjectId : assessment . insightsProjectId ,
244243 insightsProjectSlug : assessment . insightsProjectSlug ,
0 commit comments