Skip to content

Commit

Permalink
LPS-110168 Change method signature to use groupId, like getLayouts me…
Browse files Browse the repository at this point in the history
…thod
  • Loading branch information
ealonso authored and brianchandotcom committed Apr 6, 2020
1 parent 67a0421 commit f2771b3
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2026,42 +2026,42 @@ public int getLayoutsCount(
return getLayoutsCount(group, 0, privateLayout, keywords, types);
}

@Override
public int getLayoutsCount(long groupId) {
return layoutPersistence.countByGroupId(groupId);
}

@Override
public int getLayoutsCount(long groupId, boolean privateLayout) {
return layoutPersistence.countByG_P(groupId, privateLayout);
}

@Override
public int getLayoutsCount(long groupId, long masterLayoutPlid) {
return layoutPersistence.countByG_MLP(groupId, masterLayoutPlid);
}

@Override
public int getLayoutsCount(
Group group, long userId, boolean privateLayout, String keywords,
long groupId, long userId, boolean privateLayout, String keywords,
String[] types)
throws PortalException {

if (Validator.isNull(keywords)) {
return getLayoutsCount(group.getGroupId(), privateLayout);
return getLayoutsCount(groupId, privateLayout);
}

Indexer<Layout> indexer = IndexerRegistryUtil.getIndexer(
Layout.class.getName());

Hits hits = indexer.search(
_buildSearchContext(
group.getGroupId(), userId, privateLayout, keywords, types,
groupId, userId, privateLayout, keywords, types,
QueryUtil.ALL_POS, QueryUtil.ALL_POS, null));

return hits.getLength();
}

@Override
public int getLayoutsCount(long groupId) {
return layoutPersistence.countByGroupId(groupId);
}

@Override
public int getLayoutsCount(long groupId, boolean privateLayout) {
return layoutPersistence.countByG_P(groupId, privateLayout);
}

@Override
public int getLayoutsCount(long groupId, long masterLayoutPlid) {
return layoutPersistence.countByG_MLP(groupId, masterLayoutPlid);
}

@Override
public int getLayoutsCount(long groupId, String keywords, String[] types)
throws PortalException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -986,20 +986,6 @@ public List<Layout> getLayouts(
return layoutPersistence.filterFindByG_T(groupId, type, start, end);
}

@Override
public int getLayoutsCount(
Group group, boolean privateLayout, String keywords, String[] types)
throws PortalException {

if (Validator.isNull(keywords)) {
return layoutPersistence.filterCountByG_P(
group.getGroupId(), privateLayout);
}

return layoutLocalService.getLayoutsCount(
group, getUserId(), privateLayout, keywords, types);
}

@Override
public int getLayoutsCount(long groupId, boolean privateLayout) {
return layoutPersistence.filterCountByG_P(groupId, privateLayout);
Expand All @@ -1022,6 +1008,20 @@ public int getLayoutsCount(
groupId, privateLayout, parentLayoutId, priority);
}

@Override
public int getLayoutsCount(
long groupId, boolean privateLayout, String keywords,
String[] types)
throws PortalException {

if (Validator.isNull(keywords)) {
return layoutPersistence.filterCountByG_P(groupId, privateLayout);
}

return layoutLocalService.getLayoutsCount(
groupId, getUserId(), privateLayout, keywords, types);
}

@Override
public int getLayoutsCount(long groupId, String type) {
return layoutPersistence.filterCountByG_T(groupId, type);
Expand Down

0 comments on commit f2771b3

Please sign in to comment.