Index: grails-app/services/com/lemans/ds/fitment/PartFitmentManagerService.groovy =================================================================== diff -u -r4fc092c25c4a44b01a19a043f5bc80a78340e0d6 -rd62387f918194bc923545698f275fd0c49a98e01 --- grails-app/services/com/lemans/ds/fitment/PartFitmentManagerService.groovy (.../PartFitmentManagerService.groovy) (revision 4fc092c25c4a44b01a19a043f5bc80a78340e0d6) +++ grails-app/services/com/lemans/ds/fitment/PartFitmentManagerService.groovy (.../PartFitmentManagerService.groovy) (revision d62387f918194bc923545698f275fd0c49a98e01) @@ -40,22 +40,15 @@ if (!errors) { List modelYearIdsToBeCreated = modelIdsToBeCreated(partNumber, modelYearIds) if (modelYearIdsToBeCreated) { - log.debug("modelYearIdsToBeCreated $modelYearIdsToBeCreated") Timestamp now = new Timestamp(new Date().time) sql().withBatch(50, FITMENT_INSERT_SQL) { stmt -> modelYearIdsToBeCreated.each { Integer modelYearId -> stmt.addBatch([modelYearId: modelYearId, partNumber: partNumber, footnote: values.footNote ?: null, now: now, username: username]) } } - log.debug("done with batch") List createdPartFitmentIds = createdPartFitmentsByModelYearIdsAndPartNumber(modelYearIdsToBeCreated, partNumber, now) - String query = """SELECT partFitmentId FROM PartFitment WITH(NOLOCK) WHERE - partNumber = :partNumber AND modelYearId IN (${modelYearIds.join(', ')}) AND dateDeleted is NULL""" - List results = sql().rows([partNumber: partNumber], query)?.partFitmentId - log.debug("partFitmentIdCreated $results") - log.debug("createdPartFitmentIds $createdPartFitmentIds") - qcChangeLogService.createAndLogForQC('Part', partNumber, 'PartFitment', results, now, username) + qcChangeLogService.createAndLogForQC('Part', partNumber, 'PartFitment', createdPartFitmentIds, now, username) qcChangeLogService.findAndDeleteChangeLogs('PartFitment', [partNumber], username) } } @@ -201,8 +194,8 @@ private List createdPartFitmentsByModelYearIdsAndPartNumber(List modelYearIds, String partNumber, Timestamp now) { String query = """SELECT partFitmentId FROM PartFitment WITH(NOLOCK) WHERE - dateCreated = :dateCreated AND partNumber = :partNumber AND modelYearId IN (${modelYearIds.join(', ')})""" - sql().rows([partNumber: partNumber, dateCreated: now], query)?.partFitmentId + partNumber = :partNumber AND modelYearId IN (${modelYearIds.join(', ')}) AND dateDeleted is NULL""" + sql().rows([partNumber: partNumber], query)?.partFitmentId } private Map deleteFitments(String partNumber, List partFitments, String username) { Index: grails-app/services/com/lemans/ds/qualitycontrol/QcChangeLogService.groovy =================================================================== diff -u -rb4ee89a5294ff0aa256b3c50a187c511c550c0c5 -rd62387f918194bc923545698f275fd0c49a98e01 --- grails-app/services/com/lemans/ds/qualitycontrol/QcChangeLogService.groovy (.../QcChangeLogService.groovy) (revision b4ee89a5294ff0aa256b3c50a187c511c550c0c5) +++ grails-app/services/com/lemans/ds/qualitycontrol/QcChangeLogService.groovy (.../QcChangeLogService.groovy) (revision d62387f918194bc923545698f275fd0c49a98e01) @@ -344,7 +344,6 @@ int[] batch = sql().withBatch(50, CHANGE_LOG_INSERT_SQL) { stmt -> changes.each { - log.debug("it: ${it}") boolean saveChange = true List entitiesByConfig = existingChangesForEntity?.getAt(it.entityId)?.getAt(it.configId) @@ -362,7 +361,6 @@ List existingEntitiesForEntityId = existingChangesForEntity[it.entityId.toString()]?.values()?.flatten() if (createdEntity) { - log.debug("createdEntity: ${createdEntity}") changeLogsIdsToBeDeleted << createdEntity.changeLogId //Same entity is created and deleted before approve saveChange = false } @@ -383,25 +381,12 @@ changeLogsToBeDeleted << [configId: it.configId, entityId: it.entityId, userName: it.username] //ChangedValue is Same as the LastApprovedValue saveChange = false } - log.debug("changeLogsToBeUpdatedToPendingApproval: ${changeLogsToBeUpdatedToPendingApproval}") - log.debug("changeLogsToBeDeleted: ${changeLogsToBeDeleted}") - log.debug("changeLogIdsToBeDeleted: ${changeLogsIdsToBeDeleted}") - log.debug("saveChange: ${saveChange}") if (saveChange) { - log.debug("Executing..") stmt.addBatch([configId: it.configId, parentEntityId: it.parentEntityId, entityId: it.entityId, approvalStatusId: approvalStatusId, changedValue: changedValue, lastApprovedValue: lastApprovedValue, changedDate: now, changedBy: it.username]) } } } - log.debug("batch: ${batch}") - log.debug("entityIds: ${changes*.entityId}") - String query = "SELECT * FROM qc.changeLog WITH(NOLOCK) WHERE parentEntityId = '${changes[0].parentEntityId}' AND entityId IN (${changes*.entityId.join(',')})" - List results = sql().rows(query) - log.debug("results: ${results}") - log.debug("results.size(): ${results.size()}") - log.debug("changeLogIds: ${results*.changeLogId}") - println("sql lookup ${sql().rows(query)}") updateChangeLogsToPendingApproval(changeLogsToBeUpdatedToPendingApproval) deleteChangeLogsByConfigAndEntity(changeLogsToBeDeleted) deleteChangeLogsById(changeLogsIdsToBeDeleted, loggedUserName) @@ -667,8 +652,6 @@ cleanedChangeLogs.addAll(cleanLogValues(partFitmentsByYear)*.changeLogId) } } - log.debug("cleanedChangeLogs: $cleanedChangeLogs") - log.debug("keywordChanges: ${partFitmentChanges*.changeLogId}") List changeLogsThatCanBeDeleted = partFitmentChanges*.changeLogId - cleanedChangeLogs changeLogsThatCanBeDeleted }