vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-06-28 20:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Closes #227: fix searching by tag

Browse Source
This commit is contained in:
Benjamin Gamard 2018-04-06 23:37:54 +02:00
parent cedd4b47b3
commit 6d35020840
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs-core/src/main/java/com/sismics/docs/core/dao/criteria/DocumentCriteria.java
View File

@ -47,8 +47,9 @@ public class DocumentCriteria {
/** /**
* Tag IDs. * Tag IDs.
* The first level list will be AND'ed and the second level list will be OR'ed.
*/ */
private List<String> tagIdList; private List<List<String>> tagIdList;
/** /**
* Shared status. * Shared status.
@ -110,11 +111,11 @@ public class DocumentCriteria {
this.createDateMax = createDateMax; this.createDateMax = createDateMax;
} }
public List<String> getTagIdList() { public List<List<String>> getTagIdList() {
return tagIdList; return tagIdList;
} }
public void setTagIdList(List<String> tagIdList) { public void setTagIdList(List<List<String>> tagIdList) {
this.tagIdList = tagIdList; this.tagIdList = tagIdList;
} }
@ -162,8 +163,7 @@ public class DocumentCriteria {
this.updateDateMax = updateDateMax; this.updateDateMax = updateDateMax;
} }
public DocumentCriteria setActiveRoute(Boolean activeRoute) { public void setActiveRoute(Boolean activeRoute) {
this.activeRoute = activeRoute; this.activeRoute = activeRoute;
return this;
} }
} }

16
docs-core/src/main/java/com/sismics/docs/core/util/indexing/LuceneIndexingHandler.java
View File

@ -245,14 +245,16 @@ public class LuceneIndexingHandler implements IndexingHandler {
} }
if (criteria.getTagIdList() != null && !criteria.getTagIdList().isEmpty()) { if (criteria.getTagIdList() != null && !criteria.getTagIdList().isEmpty()) {
int index = 0; int index = 0;
List<String> tagCriteriaList = Lists.newArrayList(); for (List<String> tagIdList : criteria.getTagIdList()) {
for (String tagId : criteria.getTagIdList()) { List<String> tagCriteriaList = Lists.newArrayList();
sb.append(String.format("left join T_DOCUMENT_TAG dt%d on dt%d.DOT_IDDOCUMENT_C = d.DOC_ID_C and dt%d.DOT_IDTAG_C = :tagId%d and dt%d.DOT_DELETEDATE_D is null ", index, index, index, index, index)); for (String tagId : tagIdList) {
parameterMap.put("tagId" + index, tagId); sb.append(String.format("left join T_DOCUMENT_TAG dt%d on dt%d.DOT_IDDOCUMENT_C = d.DOC_ID_C and dt%d.DOT_IDTAG_C = :tagId%d and dt%d.DOT_DELETEDATE_D is null ", index, index, index, index, index));
tagCriteriaList.add(String.format("dt%d.DOT_ID_C is not null", index)); parameterMap.put("tagId" + index, tagId);
index++; tagCriteriaList.add(String.format("dt%d.DOT_ID_C is not null", index));
index++;
}
criteriaList.add("(" + Joiner.on(" OR ").join(tagCriteriaList) + ")");
} }
criteriaList.add("(" + Joiner.on(" OR ").join(tagCriteriaList) + ")");
} }
if (criteria.getShared() != null && criteria.getShared()) { if (criteria.getShared() != null && criteria.getShared()) {
criteriaList.add("s.count > 0"); criteriaList.add("s.count > 0");

18
docs-web/src/main/java/com/sismics/docs/rest/resource/DocumentResource.java
View File

@ -2,6 +2,7 @@ package com.sismics.docs.rest.resource;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.sismics.docs.core.constant.AclType; import com.sismics.docs.core.constant.AclType;
import com.sismics.docs.core.constant.ConfigType; import com.sismics.docs.core.constant.ConfigType;
import com.sismics.docs.core.constant.Constants; import com.sismics.docs.core.constant.Constants;
@ -452,14 +453,17 @@ public class DocumentResource extends BaseResource {
} }
if (tagDtoList.isEmpty()) { if (tagDtoList.isEmpty()) {
// No tag found, the request must returns nothing // No tag found, the request must returns nothing
documentCriteria.getTagIdList().add(UUID.randomUUID().toString()); documentCriteria.getTagIdList().add(Lists.newArrayList(UUID.randomUUID().toString()));
} } else {
for (TagDto tagDto : tagDtoList) { List<String> tagIdList = Lists.newArrayList();
documentCriteria.getTagIdList().add(tagDto.getId()); for (TagDto tagDto : tagDtoList) {
List<TagDto> childrenTagDtoList = TagUtil.findChildren(tagDto, allTagDtoList); tagIdList.add(tagDto.getId());
for (TagDto childrenTagDto : childrenTagDtoList) { List<TagDto> childrenTagDtoList = TagUtil.findChildren(tagDto, allTagDtoList);
documentCriteria.getTagIdList().add(childrenTagDto.getId()); for (TagDto childrenTagDto : childrenTagDtoList) {
tagIdList.add(childrenTagDto.getId());
}
} }
documentCriteria.getTagIdList().add(tagIdList);
} }
break; break;
case "after": case "after":

2
docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java
View File

@ -188,7 +188,7 @@ public class TestDocumentResource extends BaseJerseyTest {
Assert.assertEquals(2, searchDocuments("uat:" + DateTimeFormat.forPattern("yyyy-MM-dd").print(new Date().getTime()), document1Token)); Assert.assertEquals(2, searchDocuments("uat:" + DateTimeFormat.forPattern("yyyy-MM-dd").print(new Date().getTime()), document1Token));
Assert.assertEquals(2, searchDocuments("uafter:2010 ubefore:2040-08", document1Token)); Assert.assertEquals(2, searchDocuments("uafter:2010 ubefore:2040-08", document1Token));
Assert.assertEquals(1, searchDocuments("tag:super", document1Token)); Assert.assertEquals(1, searchDocuments("tag:super", document1Token));
// TODO waiting for #227 Assert.assertEquals(1, searchDocuments("tag:super tag:hr", document1Token)); Assert.assertEquals(1, searchDocuments("tag:super tag:hr", document1Token));
Assert.assertEquals(1, searchDocuments("shared:yes", document1Token)); Assert.assertEquals(1, searchDocuments("shared:yes", document1Token));
Assert.assertEquals(2, searchDocuments("lang:eng", document1Token)); Assert.assertEquals(2, searchDocuments("lang:eng", document1Token));
Assert.assertEquals(1, searchDocuments("after:2010 before:2040-08 tag:super shared:yes lang:eng title description full:uranium", document1Token)); Assert.assertEquals(1, searchDocuments("after:2010 before:2040-08 tag:super shared:yes lang:eng title description full:uranium", document1Token));