Index: grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy =================================================================== diff -u -reb086951c8bc10945fe4f3e3545b092570561f58 -r74de137e18cc17fc1121286e475b86dc6c2d0531 --- grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy (.../SolrQueryService.groovy) (revision eb086951c8bc10945fe4f3e3545b092570561f58) +++ grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy (.../SolrQueryService.groovy) (revision 74de137e18cc17fc1121286e475b86dc6c2d0531) @@ -102,7 +102,7 @@ List adminOverview(QueuePayload payload) { List futures = [ queueCountsForPartsWithOutCategory(payload, pool), - queueCountsForPartsWithOutPrimaryImage(payload, pool), + /* queueCountsForPartsWithOutPrimaryImage(payload, pool), queueCountsForPartsWithOutProduct(payload, pool), queueCountsForPartsWithOutAttributeValue(payload, pool), queueCountsForProductsWithOutPrimaryImage(payload, pool), @@ -131,7 +131,7 @@ queueCountsForQCProductRejected(payload, pool), latestGoliveDate(payload, pool), earliestGoliveDate(payload, pool), - partLastUpdated(payload, pool), + partLastUpdated(payload, pool),*/ productLastUpdated(payload, pool) ] List queueCounts = futures.stream().map { CompletableFuture future -> future.join() }.collect(Collectors.toList()) @@ -245,11 +245,11 @@ } - private CompletableFuture latestGoliveDate(QueuePayload payload, Executor executor) { + private CompletableFuture earliestGoliveDate(QueuePayload payload, Executor executor) { CompletableFuture.supplyAsync(new Supplier() { @Override Map get() { - QueuePayload queuePayload = copyWithQueueType(payload, QueueType.PART_LATEST_GO_LIVE_DATE) + QueuePayload queuePayload = copyWithQueueType(payload, QueueType.PART_EARLIEST_GO_LIVE_DATE) SolrQuery query = new SolrQuery() .addFilterQuery('(qcStatusCode:13001)') query.add('json.facet', '{uniqueVals:{type:terms,field:userName,missing:true,mincount:1,limit:-1,facet:{date:"min(goliveDate)"}}}') @@ -259,11 +259,11 @@ }, executor) } - private CompletableFuture earliestGoliveDate(QueuePayload payload, Executor executor) { + private CompletableFuture latestGoliveDate(QueuePayload payload, Executor executor) { CompletableFuture.supplyAsync(new Supplier() { @Override Map get() { - QueuePayload queuePayload = copyWithQueueType(payload, QueueType.PART_EARLIEST_GO_LIVE_DATE) + QueuePayload queuePayload = copyWithQueueType(payload, QueueType.PART_LATEST_GO_LIVE_DATE) SolrQuery query = new SolrQuery() .addFilterQuery('(qcStatusCode:13001)') query.add('json.facet', '{uniqueVals:{type:terms,field:userName,missing:true,mincount:1,limit:-1,facet:{date:"max(goliveDate)"}}}') @@ -286,6 +286,20 @@ }, executor) } + /* private CompletableFuture productLastUpdated(QueuePayload payload, Executor executor) { + CompletableFuture.supplyAsync(new Supplier() { + @Override + Map get() { + QueuePayload queuePayload = copyWithQueueType(payload, QueueType.PRODUCT_LAST_UPDATED) + SolrQuery query = new SolrQuery() + .addFilterQuery('(qcProductStatusCode:13001)') + query.add('json.facet', '{uniqueVals:{type:terms,field:userName,missing:true,limit:-1,facet:{date:"max(qcProductLastUpdated)"}}}') + addFacetFilters(query, queuePayload) + buildResponseDate(dsQueueSolrClient.request(new QueryRequest(query)), queuePayload) + } + }, executor) + }*/ + private CompletableFuture productLastUpdated(QueuePayload payload, Executor executor) { CompletableFuture.supplyAsync(new Supplier() { @Override @@ -713,14 +727,16 @@ List values if (payload.viewType == ViewType.ADMIN) { values = buckets?.collect { SimpleOrderedMap fieldStatsInfo -> - [userName: fieldStatsInfo.get('val'), date: fieldStatsInfo.get('date')] + Date date = Date.parse('yyyy-MM-dd', fieldStatsInfo.get('date') as String) + [userName: fieldStatsInfo.get('val'), date: date - new Date()] } if (missing?.get('date')) { values.add([userName: 'No User Assigned', date: missing.get('date')]) } } else { values = buckets?.collect { SimpleOrderedMap fieldStatsInfo -> - [categoryId: (fieldStatsInfo.get('val') ?: '')?.toInteger(), date: fieldStatsInfo.get('date')] + Date date = Date.parse('yyyy-MM-dd', fieldStatsInfo.get('date') as String) + [categoryId: (fieldStatsInfo.get('val') ?: '')?.toInteger(), date: date - new Date()] } if (missing?.get('date')) { values.add([categoryId: -1, date: missing.get('date')])