Index: grails-app/controllers/com/lemans/ds/solr/DsSolrQueueController.groovy =================================================================== diff -u -rf9a47eacbacba622dfb2b5de0648bcdfa998c8cf -r4de017e5153c785456a1392c7744bea5a8e9cc6c --- grails-app/controllers/com/lemans/ds/solr/DsSolrQueueController.groovy (.../DsSolrQueueController.groovy) (revision f9a47eacbacba622dfb2b5de0648bcdfa998c8cf) +++ grails-app/controllers/com/lemans/ds/solr/DsSolrQueueController.groovy (.../DsSolrQueueController.groovy) (revision 4de017e5153c785456a1392c7744bea5a8e9cc6c) @@ -122,10 +122,10 @@ PARTS_NEED_MARKETING_DESCR_CHANGE('Parts Need Marketing Description Change', QueueMode.PART), - QC_PART_PENDING_APPROVAL('QC Pending Approval', QueueMode.PART), - QC_PART_REJECTED('QC Rejected', QueueMode.PART), - QC_PENDING_FUTURE_PARTS('QC Pending Future Parts', QueueMode.PART), - QC_PENDING_LIVE_PARTS('QC Pending Live Parts', QueueMode.PART), + QC_PART_PENDING_APPROVAL('Number of Parts Pending Approval', QueueMode.PART), + QC_PART_REJECTED('Number of Parts Rejected', QueueMode.PART), + QC_PRODUCT_PENDING_APPROVAL('Number of Products Pending Approval', QueueMode.PRODUCT), + QC_PRODUCT_REJECTED('Number of Products Rejected', QueueMode.PRODUCT), PART_ATTR_RESEARCH_VALUE_NONE('None', QueueMode.PART), PART_ATTR_RESEARCH_VALUE_LEVEL1('Level 1', QueueMode.PART), Index: grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy =================================================================== diff -u -rf9a47eacbacba622dfb2b5de0648bcdfa998c8cf -r4de017e5153c785456a1392c7744bea5a8e9cc6c --- grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy (.../SolrQueryService.groovy) (revision f9a47eacbacba622dfb2b5de0648bcdfa998c8cf) +++ grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy (.../SolrQueryService.groovy) (revision 4de017e5153c785456a1392c7744bea5a8e9cc6c) @@ -127,8 +127,8 @@ queueCountsForPartsWithComCodesNotAssociatedToCategory(payload, pool), queueCountsForQcPartPendingApproval(payload, pool), queueCountsForQcPartRejected(payload, pool), - queueCountsForQcPendingFutureParts(payload, pool), - queueCountsForQcPendingLiveParts(payload, pool) + queueCountsForQCProductPendingApproval(payload, pool), + queueCountsForQCProductRejected(payload, pool) ] List queueCounts = futures.stream().map { CompletableFuture future -> future.join() }.collect(Collectors.toList()) injectPastWeekCounts(queueCounts) @@ -214,28 +214,26 @@ }, executor) } - private CompletableFuture queueCountsForQcPendingFutureParts(QueuePayload payload, Executor executor) { + private CompletableFuture queueCountsForQCProductPendingApproval(QueuePayload payload, Executor executor) { CompletableFuture.supplyAsync(new Supplier() { @Override Map get() { - QueuePayload queuePayload = copyWithQueueType(payload, QueueType.QC_PENDING_FUTURE_PARTS) + QueuePayload queuePayload = copyWithQueueType(payload, QueueType.QC_PRODUCT_PENDING_APPROVAL) SolrQuery query = new SolrQuery() - .addFilterQuery('(qcStatusCode:13001)') - .addFilterQuery('(derivedPartStatusId:9006)') + .addFilterQuery('(qcProductStatusCode:13001)') QueryResponse queryResponse = dsQueueSolrClient.query(buildFacetQuery(query, queuePayload)) buildResponse(queryResponse, queuePayload) } }, executor) } - private CompletableFuture queueCountsForQcPendingLiveParts(QueuePayload payload, Executor executor) { + private CompletableFuture queueCountsForQCProductRejected(QueuePayload payload, Executor executor) { CompletableFuture.supplyAsync(new Supplier() { @Override Map get() { - QueuePayload queuePayload = copyWithQueueType(payload, QueueType.QC_PENDING_LIVE_PARTS) + QueuePayload queuePayload = copyWithQueueType(payload, QueueType.QC_PRODUCT_REJECTED) SolrQuery query = new SolrQuery() - .addFilterQuery('(qcStatusCode:13001)') - .addFilterQuery('(-derivedPartStatusId:9006)') + .addFilterQuery('(qcProductStatusCode:13003)') QueryResponse queryResponse = dsQueueSolrClient.query(buildFacetQuery(query, queuePayload)) buildResponse(queryResponse, queuePayload) }