|
37 | 37 | import org.ligoj.app.plugin.inbox.sql.model.MessageTargetType; |
38 | 38 | import org.ligoj.app.resource.node.NodeResource; |
39 | 39 | import org.ligoj.app.resource.project.BasicProjectVo; |
40 | | -import org.ligoj.app.resource.project.ProjectResource; |
| 40 | +import org.ligoj.app.resource.project.ProjectHelper; |
41 | 41 | import org.ligoj.bootstrap.core.AuditedBean; |
42 | 42 | import org.ligoj.bootstrap.core.INamableBean; |
43 | 43 | import org.ligoj.bootstrap.core.json.PaginationJson; |
@@ -86,7 +86,7 @@ public class MessageResource implements InitializingBean, ISessionSettingsProvid |
86 | 86 | protected CompanyResource companyResource; |
87 | 87 |
|
88 | 88 | @Autowired |
89 | | - protected ProjectResource projectResource; |
| 89 | + protected ProjectHelper projectHelper; |
90 | 90 |
|
91 | 91 | @Autowired |
92 | 92 | protected NodeResource nodeResource; |
@@ -303,7 +303,7 @@ private TableItem<MessageVo> findAllProvider(final UriInfo uriInfo, final BiFunc |
303 | 303 | private void fillTarget(final Message message, final MessageVo vo) { |
304 | 304 | switch (message.getTargetType()) { |
305 | 305 | case PROJECT: |
306 | | - vo.setProject(projectResource.findByPKey(message.getTarget())); |
| 306 | + vo.setProject(projectHelper.findByPKey(message.getTarget())); |
307 | 307 | break; |
308 | 308 | case COMPANY: |
309 | 309 | vo.setCompany(companyResource.findByName(message.getTarget())); |
@@ -339,7 +339,7 @@ public int countUnread() { |
339 | 339 | public void afterPropertiesSet() { |
340 | 340 | checker.put(MessageTargetType.COMPANY, companyResource::findByIdExpected); |
341 | 341 | checker.put(MessageTargetType.GROUP, groupResource::findByIdExpected); |
342 | | - checker.put(MessageTargetType.PROJECT, projectResource::findByPKey); |
| 342 | + checker.put(MessageTargetType.PROJECT, projectHelper::findByPKey); |
343 | 343 | checker.put(MessageTargetType.NODE, nodeResource::findById); |
344 | 344 | checker.put(MessageTargetType.USER, userResource::findById); |
345 | 345 | } |
|
0 commit comments