forked from apache/fineract
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request apache#484 from ShruthiRajaram/FINERACT-628_Surveys
FINERACT-628 Self service APIs for Surveys
- Loading branch information
Showing
3 changed files
with
305 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
...er/src/main/java/org/apache/fineract/portfolio/self/spm/api/SelfScorecardApiResource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fineract.portfolio.self.spm.api; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import javax.ws.rs.Consumes; | ||
| import javax.ws.rs.GET; | ||
| import javax.ws.rs.POST; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.PathParam; | ||
| import javax.ws.rs.Produces; | ||
| import javax.ws.rs.core.MediaType; | ||
|
|
||
| import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; | ||
| import org.apache.fineract.portfolio.client.exception.ClientNotFoundException; | ||
| import org.apache.fineract.portfolio.self.client.service.AppuserClientMapperReadService; | ||
| import org.apache.fineract.spm.api.ScorecardApiResource; | ||
| import org.apache.fineract.spm.data.ScorecardData; | ||
| import org.apache.fineract.useradministration.domain.AppUser; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.context.annotation.Scope; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| @Path("/self/surveys/scorecards") | ||
| @Component | ||
| @Scope("singleton") | ||
| public class SelfScorecardApiResource { | ||
|
|
||
| private final PlatformSecurityContext context; | ||
| private final ScorecardApiResource scorecardApiResource; | ||
| private final AppuserClientMapperReadService appuserClientMapperReadService; | ||
|
|
||
| @Autowired | ||
| public SelfScorecardApiResource(final PlatformSecurityContext securityContext, | ||
| final AppuserClientMapperReadService appuserClientMapperReadService, | ||
| final ScorecardApiResource scorecardApiResource) { | ||
| this.context = securityContext; | ||
| this.scorecardApiResource = scorecardApiResource; | ||
| this.appuserClientMapperReadService = appuserClientMapperReadService; | ||
| } | ||
|
|
||
| @GET | ||
| @Path("clients/{clientId}") | ||
| @Consumes({ MediaType.APPLICATION_JSON }) | ||
| @Produces({ MediaType.APPLICATION_JSON }) | ||
| @Transactional | ||
| public List<ScorecardData> findByClient(@PathParam("clientId") final Long clientId) { | ||
|
|
||
| validateAppuserClientsMapping(clientId); | ||
| return this.scorecardApiResource.findByClient(clientId); | ||
| } | ||
|
|
||
| @POST | ||
| @Path("{surveyId}") | ||
| @Consumes({ MediaType.APPLICATION_JSON }) | ||
| @Produces({ MediaType.APPLICATION_JSON }) | ||
| @Transactional | ||
| public void createScorecard(@PathParam("surveyId") final Long surveyId, final ScorecardData scorecardData) { | ||
| if (scorecardData.getClientId() != null) { | ||
| validateAppuserClientsMapping(scorecardData.getClientId()); | ||
| this.scorecardApiResource.createScorecard(surveyId, scorecardData); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private void validateAppuserClientsMapping(final Long clientId) { | ||
| AppUser user = this.context.authenticatedUser(); | ||
| final boolean mappedClientId = this.appuserClientMapperReadService.isClientMappedToUser(clientId, user.getId()); | ||
| if (!mappedClientId) { | ||
| throw new ClientNotFoundException(clientId); | ||
| } | ||
| } | ||
|
|
||
| } |
62 changes: 62 additions & 0 deletions
62
...provider/src/main/java/org/apache/fineract/portfolio/self/spm/api/SelfSpmApiResource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.fineract.portfolio.self.spm.api; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import javax.ws.rs.Consumes; | ||
| import javax.ws.rs.GET; | ||
| import javax.ws.rs.Path; | ||
| import javax.ws.rs.Produces; | ||
| import javax.ws.rs.core.MediaType; | ||
|
|
||
| import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; | ||
| import org.apache.fineract.spm.api.SpmApiResource; | ||
| import org.apache.fineract.spm.data.SurveyData; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.context.annotation.Scope; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| @Path("/self/surveys") | ||
| @Component | ||
| @Scope("singleton") | ||
| public class SelfSpmApiResource { | ||
|
|
||
| private final PlatformSecurityContext securityContext; | ||
| private final SpmApiResource spmApiResource; | ||
|
|
||
| @Autowired | ||
| public SelfSpmApiResource(final PlatformSecurityContext securityContext, final SpmApiResource spmApiResource) { | ||
| this.securityContext = securityContext; | ||
| this.spmApiResource = spmApiResource; | ||
| } | ||
|
|
||
| @GET | ||
| @Consumes({ MediaType.APPLICATION_JSON }) | ||
| @Produces({ MediaType.APPLICATION_JSON }) | ||
| @Transactional | ||
| public List<SurveyData> fetchAllSurveys() { | ||
| securityContext.authenticatedUser(); | ||
| final Boolean isActive = true; | ||
| return this.spmApiResource.fetchAllSurveys(isActive); | ||
| } | ||
|
|
||
| } |