Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
civitas-digitalis
platform
Commits
2789bde6
Commit
2789bde6
authored
Jan 11, 2018
by
Elias Englmeier
Browse files
added a few functions to accomodate tagging
parent
1eb38d30
Changes
18
Hide whitespace changes
Inline
Side-by-side
modules/analysisService/analysisService-api/src/main/java/analysisService/service/TagDataLocalService.java
View file @
2789bde6
...
...
@@ -119,6 +119,10 @@ public interface TagDataLocalService extends BaseLocalService,
@Indexable
(
type
=
IndexableType
.
REINDEX
)
public
TagData
updateTagData
(
TagData
tagData
);
/**
* Can be used to check for duplicate strings in the Tag table
* returns true if new tag is already present
*/
public
boolean
findTagData
(
java
.
lang
.
String
tag
);
@Transactional
(
propagation
=
Propagation
.
SUPPORTS
,
readOnly
=
true
)
...
...
@@ -209,6 +213,10 @@ public interface TagDataLocalService extends BaseLocalService,
@Transactional
(
propagation
=
Propagation
.
SUPPORTS
,
readOnly
=
true
)
public
List
<
TagData
>
getTagDatas
(
int
start
,
int
end
);
/**
* adds Tag String to the Tag table
* auto increments the Tag ID - PK
*/
public
long
addNewTag
(
java
.
lang
.
String
tag
);
/**
...
...
@@ -228,4 +236,7 @@ public interface TagDataLocalService extends BaseLocalService,
*/
public
long
dynamicQueryCount
(
DynamicQuery
dynamicQuery
,
Projection
projection
);
@Transactional
(
propagation
=
Propagation
.
SUPPORTS
,
readOnly
=
true
)
public
long
getTagIdByTagName
(
java
.
lang
.
String
name
);
}
\ No newline at end of file
modules/analysisService/analysisService-api/src/main/java/analysisService/service/TagDataLocalServiceUtil.java
View file @
2789bde6
...
...
@@ -113,6 +113,10 @@ public class TagDataLocalServiceUtil {
return
getService
().
updateTagData
(
tagData
);
}
/**
* Can be used to check for duplicate strings in the Tag table
* returns true if new tag is already present
*/
public
static
boolean
findTagData
(
java
.
lang
.
String
tag
)
{
return
getService
().
findTagData
(
tag
);
}
...
...
@@ -228,6 +232,10 @@ public class TagDataLocalServiceUtil {
return
getService
().
getTagDatas
(
start
,
end
);
}
/**
* adds Tag String to the Tag table
* auto increments the Tag ID - PK
*/
public
static
long
addNewTag
(
java
.
lang
.
String
tag
)
{
return
getService
().
addNewTag
(
tag
);
}
...
...
@@ -256,6 +264,10 @@ public class TagDataLocalServiceUtil {
return
getService
().
dynamicQueryCount
(
dynamicQuery
,
projection
);
}
public
static
long
getTagIdByTagName
(
java
.
lang
.
String
name
)
{
return
getService
().
getTagIdByTagName
(
name
);
}
public
static
TagDataLocalService
getService
()
{
return
_serviceTracker
.
getService
();
}
...
...
modules/analysisService/analysisService-api/src/main/java/analysisService/service/TagDataLocalServiceWrapper.java
View file @
2789bde6
...
...
@@ -110,6 +110,10 @@ public class TagDataLocalServiceWrapper implements TagDataLocalService,
return
_tagDataLocalService
.
updateTagData
(
tagData
);
}
/**
* Can be used to check for duplicate strings in the Tag table
* returns true if new tag is already present
*/
@Override
public
boolean
findTagData
(
java
.
lang
.
String
tag
)
{
return
_tagDataLocalService
.
findTagData
(
tag
);
...
...
@@ -237,6 +241,10 @@ public class TagDataLocalServiceWrapper implements TagDataLocalService,
return
_tagDataLocalService
.
getTagDatas
(
start
,
end
);
}
/**
* adds Tag String to the Tag table
* auto increments the Tag ID - PK
*/
@Override
public
long
addNewTag
(
java
.
lang
.
String
tag
)
{
return
_tagDataLocalService
.
addNewTag
(
tag
);
...
...
@@ -268,6 +276,11 @@ public class TagDataLocalServiceWrapper implements TagDataLocalService,
return
_tagDataLocalService
.
dynamicQueryCount
(
dynamicQuery
,
projection
);
}
@Override
public
long
getTagIdByTagName
(
java
.
lang
.
String
name
)
{
return
_tagDataLocalService
.
getTagIdByTagName
(
name
);
}
@Override
public
TagDataLocalService
getWrappedService
()
{
return
_tagDataLocalService
;
...
...
modules/analysisService/analysisService-service/src/main/java/analysisService/service/impl/TagDataLocalServiceImpl.java
View file @
2789bde6
...
...
@@ -14,6 +14,8 @@
package
analysisService.service.impl
;
import
java.util.List
;
import
analysisService.exception.NoSuchTagDataException
;
import
analysisService.model.TagData
;
import
analysisService.model.impl.TagDataImpl
;
...
...
@@ -48,11 +50,11 @@ public class TagDataLocalServiceImpl extends TagDataLocalServiceBaseImpl {
public
long
addNewTag
(
String
tag
){
TagData
newTagData
=
new
TagDataImpl
();
newTagData
.
setTag
(
tag
);
TagDataLocalServiceUtil
.
addTagData
(
newTagData
);
return
newTagData
.
getPrimaryKey
();
}
/**
* Can be used to check for duplicate strings in the Tag table
* returns true if new tag is already present
...
...
@@ -65,4 +67,14 @@ public class TagDataLocalServiceImpl extends TagDataLocalServiceBaseImpl {
}
return
true
;
}
public
long
getTagIdByTagName
(
String
name
){
List
<
TagData
>
allTags
=
TagDataUtil
.
findAll
();
for
(
TagData
d
:
allTags
){
if
(
d
.
getTag
().
equals
(
name
)){
return
d
.
getPrimaryKey
();
}
}
return
-
1
;
}
}
\ No newline at end of file
modules/analysisService/analysisService-service/src/main/resources/service.properties
View file @
2789bde6
...
...
@@ -13,6 +13,6 @@
##
build.namespace
=
ANALYSIS
build.number
=
7
2
build.date
=
1515
488544
54
4
build.number
=
7
6
build.date
=
1515
677473
54
9
build.auto.upgrade
=
true
\ No newline at end of file
modules/guestbook/guestbook-service/src/main/resources/service.properties
View file @
2789bde6
...
...
@@ -13,6 +13,6 @@
##
build.namespace
=
GB
build.number
=
9
3
build.date
=
1515
488548834
build.number
=
9
7
build.date
=
1515
677478102
build.auto.upgrade
=
true
\ No newline at end of file
modules/ideaService/ideaService-api/bin/ideaService/service/IdeasLocalService.class
View file @
2789bde6
No preview for this file type
modules/ideaService/ideaService-api/bin/ideaService/service/IdeasLocalServiceUtil.class
View file @
2789bde6
No preview for this file type
modules/ideaService/ideaService-api/bin/ideaService/service/IdeasLocalServiceWrapper.class
View file @
2789bde6
No preview for this file type
modules/ideaService/ideaService-api/src/main/java/ideaService/service/IdeasLocalService.java
View file @
2789bde6
...
...
@@ -347,6 +347,9 @@ public interface IdeasLocalService extends BaseLocalService,
long
companyId
,
int
start
,
int
end
,
OrderByComparator
<
Ideas
>
orderByComparator
);
@Transactional
(
propagation
=
Propagation
.
SUPPORTS
,
readOnly
=
true
)
public
List
<
java
.
lang
.
String
>
getTagsForIdea
(
long
ideasId
);
public
List
<
java
.
lang
.
String
>
ratingStringToList
(
java
.
lang
.
String
s
);
/**
...
...
modules/ideaService/ideaService-api/src/main/java/ideaService/service/IdeasLocalServiceUtil.java
View file @
2789bde6
...
...
@@ -403,6 +403,10 @@ public class IdeasLocalServiceUtil {
orderByComparator
);
}
public
static
java
.
util
.
List
<
java
.
lang
.
String
>
getTagsForIdea
(
long
ideasId
)
{
return
getService
().
getTagsForIdea
(
ideasId
);
}
public
static
java
.
util
.
List
<
java
.
lang
.
String
>
ratingStringToList
(
java
.
lang
.
String
s
)
{
return
getService
().
ratingStringToList
(
s
);
...
...
modules/ideaService/ideaService-api/src/main/java/ideaService/service/IdeasLocalServiceWrapper.java
View file @
2789bde6
...
...
@@ -424,6 +424,11 @@ public class IdeasLocalServiceWrapper implements IdeasLocalService,
start
,
end
,
orderByComparator
);
}
@Override
public
java
.
util
.
List
<
java
.
lang
.
String
>
getTagsForIdea
(
long
ideasId
)
{
return
_ideasLocalService
.
getTagsForIdea
(
ideasId
);
}
@Override
public
java
.
util
.
List
<
java
.
lang
.
String
>
ratingStringToList
(
java
.
lang
.
String
s
)
{
...
...
modules/ideaService/ideaService-service/bin/ideaService/service/impl/IdeasLocalServiceImpl.class
View file @
2789bde6
No preview for this file type
modules/ideaService/ideaService-service/build.gradle
View file @
2789bde6
...
...
@@ -4,6 +4,7 @@ dependencies {
compileOnly
group:
"com.liferay"
,
name:
"com.liferay.portal.spring.extender"
,
version:
"2.0.0"
compileOnly
group:
"com.liferay.portal"
,
name:
"com.liferay.portal.kernel"
,
version:
"2.6.0"
compileOnly
project
(
":modules:ideaService:ideaService-api"
)
compileOnly
project
(
":modules:analysisService:analysisService-api"
)
compileOnly
group:
"com.liferay.portal"
,
name:
"com.liferay.portal.kernel"
,
version:
"2.0.0"
compileOnly
group:
"com.liferay"
,
name:
"com.liferay.contacts.api"
,
version:
"2.0.0"
compileOnly
group:
"javax.portlet"
,
name:
"portlet-api"
,
version:
"2.0"
...
...
modules/ideaService/ideaService-service/src/main/java/ideaService/service/impl/IdeasLocalServiceImpl.java
View file @
2789bde6
...
...
@@ -48,6 +48,7 @@ import ideaService.service.IdeasLocalServiceUtil;
import
ideaService.service.base.IdeasLocalServiceBaseImpl
;
import
ideaService.service.persistence.IdeasUtil
;
import
ideasService.service.enums.ReviewStatus
;
import
analysisService.service.TagDataLocalServiceUtil
;
/**
* The implementation of the ideas local service.
...
...
@@ -93,6 +94,25 @@ public class IdeasLocalServiceImpl extends IdeasLocalServiceBaseImpl {
return
result
;
}
public
List
<
String
>
getTagsForIdea
(
long
ideasId
){
ArrayList
<
String
>
result
=
new
ArrayList
<
String
>
();
try
{
Ideas
idea
=
IdeasUtil
.
findByPrimaryKey
(
ideasId
);
String
[]
tagPrimaryKeys
=
idea
.
getTags
().
split
(
","
);
for
(
int
i
=
0
;
i
<
tagPrimaryKeys
.
length
;
i
++){
long
tagKey
=
Long
.
parseLong
(
tagPrimaryKeys
[
i
].
replaceAll
(
"\\s+"
,
""
));
result
.
add
(
TagDataLocalServiceUtil
.
getTagData
(
tagKey
).
getTag
());
}
}
catch
(
NumberFormatException
|
PortalException
e
)
{
// TODO Auto-generated catch block
e
.
printStackTrace
();
}
return
result
;
}
public
void
setIdeaReviewStatus
(
long
ideasId
,
ReviewStatus
status
){
try
{
Ideas
i
=
IdeasUtil
.
findByPrimaryKey
(
ideasId
);
...
...
modules/ideaService/ideaService-service/src/main/resources/service.properties
View file @
2789bde6
...
...
@@ -13,6 +13,6 @@
##
build.namespace
=
IDEA
build.number
=
2
26
build.date
=
1515
488553545
build.number
=
2
30
build.date
=
1515
677482780
build.auto.upgrade
=
true
\ No newline at end of file
modules/projectService/projectService-service/src/main/resources/service.properties
View file @
2789bde6
...
...
@@ -13,6 +13,6 @@
##
build.namespace
=
PROJECT
build.number
=
1
38
build.date
=
15154
8
8556
284
build.number
=
1
42
build.date
=
1515
677
485
4
56
build.auto.upgrade
=
true
\ No newline at end of file
modules/surveyAPI/surveyAPI-service/src/main/resources/service.properties
View file @
2789bde6
...
...
@@ -13,6 +13,6 @@
##
build.namespace
=
SURVEY
build.number
=
2
37
build.date
=
1515
488561189
build.number
=
2
41
build.date
=
1515
677490480
build.auto.upgrade
=
true
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment