Index: src/main/groovy/com/lemans/pricecalc/services/widen/WidenService.groovy =================================================================== diff -u -rf62d19f504e0bca658c1a39a5a29c95275aff2a1 -rdd931d2cdf82bd98efca542b847876dbb3840de0 --- src/main/groovy/com/lemans/pricecalc/services/widen/WidenService.groovy (.../WidenService.groovy) (revision f62d19f504e0bca658c1a39a5a29c95275aff2a1) +++ src/main/groovy/com/lemans/pricecalc/services/widen/WidenService.groovy (.../WidenService.groovy) (revision dd931d2cdf82bd98efca542b847876dbb3840de0) @@ -121,7 +121,7 @@ CalcPro.vwCatalogPart cp WITH(NOLOCK) WHERE catalogId = :catalogId - AND vendorId NOT IN (SELECT vendorId FROM CalcPro.vwCatalogPart WHERE catalogId = :catalogId + AND NOT EXISTS (SELECT vendorId FROM CalcPro.vwCatalogPart WHERE catalogId = :catalogId AND ((statusCodeDescr <> 'Finalized') AND (statusCodeDescr <> 'Revision') AND (statusCodeDescr <> 'Revision Finalized') AND (statusCodeDescr <> 'New Part'))) """ @@ -319,26 +319,4 @@ } } } - -// void calcSend(Map data, List errors) { -// Timestamp now = new Timestamp(new Date().time) -// List allFinalizedVendors = sql().rows([catalogId: data.catalogId], ALL_FINALIZED_VENDORS)*.vendorId -// if (allFinalizedVendors) { -// List lastUpdatedVendors = sql().rows([catalogId: data.catalogId], UPDATED_PART_VENDOR_AFTER_FEED_SENT)*.vendorId -// List previousSentVendors = sql().rows([catalogId: data.catalogId], WIDEN_FEED_VENDOR_QUERY)*.vendorId -// List newFinalizedVendors = allFinalizedVendors - previousSentVendors -// List deletedPartVendorsAfterFeedSent = sql().rows([catalogId: data.catalogId], DELETED_PART_VENDOR_AFTER_FEED_SENT)*.vendorId -// List vendorsThatChanged = (newFinalizedVendors + deletedPartVendorsAfterFeedSent + lastUpdatedVendors)?.unique() -// if (vendorsThatChanged) { -// cloudService.uploadToS3(data, getParts([catalogId: data.catalogId, vendorIds: allFinalizedVendors]), getCatalogDetails([catalogId: data.catalogId]), errors) -// if (!errors) { -// sql().withBatch(50, WIDEN_INSERT_QUERY) { stmt -> -// vendorsThatChanged?.each { vendor -> -// stmt.addBatch([catalogId: data.catalogId, vendorId: vendor, response: 'Successfully uploaded file to s3', now: now, user: data.user]) -// } -// } -// } -// } -// } -// } }