Skip to content

Commit 5d7271e

Browse files
chore: Exclude secondary report beans from swagger profile and document minimal context setup
- Added @Profile("!swagger") to all secondary report beans (controller, service, repo, entity) - Updated workflow with maintainer note for swagger profile minimal context
1 parent 4872f7d commit 5d7271e

12 files changed

Lines changed: 27 additions & 7 deletions

File tree

src/main/java/com/iemr/common/config/PrimaryDBConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
@Configuration
4848
@EnableTransactionManagement
4949
@EnableJpaRepositories(entityManagerFactoryRef = "entityManagerFactory", basePackages = { "com.iemr.common.repository",
50-
"com.iemr.common.repo", "com.iemr.common.notification.agent", "com.iemr.common.covidVaccination", "com.iemr.common.repository.everwell.*", "com.iemr.common.data.grievance", "com.iemr.common.repository.users" })
50+
"com.iemr.common.repo", "com.iemr.common.notification.agent", "com.iemr.common.covidVaccination", "com.iemr.common.repository.everwell.*", "com.iemr.common.data.grievance", "com.iemr.common.repository.users" })
51+
@org.springframework.context.annotation.Profile("!swagger")
5152
public class PrimaryDBConfig {
5253

5354
Logger logger = LoggerFactory.getLogger(this.getClass().getName());

src/main/java/com/iemr/common/config/SecondaryDBConfig.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,13 @@
4343

4444
import jakarta.persistence.EntityManagerFactory;
4545

46+
import org.springframework.context.annotation.Profile;
47+
4648
@Configuration
4749
@EnableTransactionManagement
4850
@EnableJpaRepositories(entityManagerFactoryRef = "secondaryEntityManagerFactory", transactionManagerRef = "secondaryTransactionManager", basePackages = {
49-
"com.iemr.common.secondary.repository.callreport" })
51+
"com.iemr.common.secondary.repository.callreport" })
52+
@Profile("!swagger")
5053
public class SecondaryDBConfig {
5154

5255
Logger logger = LoggerFactory.getLogger(this.getClass().getName());

src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.springframework.web.bind.annotation.RequestMapping;
4040
import org.springframework.web.bind.annotation.RequestMethod;
4141
import org.springframework.web.bind.annotation.RestController;
42+
import org.springframework.context.annotation.Profile;
4243

4344
import com.fasterxml.jackson.core.JsonProcessingException;
4445
import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -80,6 +81,7 @@
8081

8182
@RequestMapping({ "/beneficiary" })
8283
@RestController
84+
@Profile("!swagger")
8385
public class BeneficiaryRegistrationController {
8486

8587
private InputMapper inputMapper = new InputMapper();

src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipSecondaryReports.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.web.bind.annotation.RequestBody;
3333
import org.springframework.web.bind.annotation.RequestMapping;
3434
import org.springframework.web.bind.annotation.RequestMethod;
35+
import org.springframework.context.annotation.Profile;
3536
import org.springframework.web.bind.annotation.RestController;
3637

3738
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -46,6 +47,7 @@
4647
import io.swagger.v3.oas.annotations.Operation;
4748
import jakarta.servlet.http.HttpServletRequest;
4849

50+
@Profile("!swagger")
4951
@RequestMapping({ "/crmReports" })
5052
@RestController
5153
public class CustomerRelationshipSecondaryReports {

src/main/java/com/iemr/common/secondary/repository/callreport/CallReportSecondaryRepo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@
2727
import org.springframework.data.jpa.repository.Query;
2828
import org.springframework.data.repository.CrudRepository;
2929
import org.springframework.data.repository.query.Param;
30+
import org.springframework.context.annotation.Profile;
3031
import org.springframework.stereotype.Repository;
3132

3233
import common.iemr.common.secondary.data.report.SecondaryCallReport;
3334

35+
@Profile("!swagger")
3436
@Repository
3537
public interface CallReportSecondaryRepo extends CrudRepository<SecondaryCallReport, Long> {
3638
@Query(value="call Pr_104QAReport(:startDateTime,:endDateTime,:receivedRoleName,:agentID,:providerServiceMapID)", nativeQuery=true)

src/main/java/com/iemr/common/service/reportSecondary/SecondaryReportService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* You should have received a copy of the GNU General Public License
2020
* along with this program. If not, see https://www.gnu.org/licenses/.
2121
*/
22+
2223
package com.iemr.common.service.reportSecondary;
2324

2425
import java.io.ByteArrayInputStream;

src/main/java/com/iemr/common/service/reportSecondary/SecondaryReportServiceImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.slf4j.Logger;
3636
import org.slf4j.LoggerFactory;
3737
import org.springframework.beans.factory.annotation.Autowired;
38+
import org.springframework.context.annotation.Profile;
3839
import org.springframework.stereotype.Service;
3940

4041
import com.iemr.common.data.callhandling.CallType;
@@ -53,6 +54,7 @@
5354
import com.iemr.common.utils.mapper.InputMapper;
5455

5556

57+
@Profile("!swagger")
5658
@Service
5759
public class SecondaryReportServiceImpl implements SecondaryReportService {
5860
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());

src/main/java/com/iemr/common/utils/FilterConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.springframework.data.redis.core.StringRedisTemplate;
3434

3535
@Configuration
36+
@org.springframework.context.annotation.Profile("!swagger")
3637
public class FilterConfig {
3738

3839
private static final Logger log = LoggerFactory.getLogger(FilterConfig.class);

src/main/java/com/iemr/common/utils/JwtAuthenticationUtil.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import jakarta.servlet.http.HttpServletRequest;
2121

2222
@Component
23+
@org.springframework.context.annotation.Profile("!swagger")
2324
public class JwtAuthenticationUtil {
2425

2526
@Autowired

src/main/java/common/iemr/common/secondary/data/report/SecondaryCallReport.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,15 @@
2929
import com.iemr.common.utils.mapper.OutputMapper;
3030

3131
import jakarta.persistence.Column;
32+
import org.springframework.context.annotation.Profile;
3233
import jakarta.persistence.Entity;
3334
import jakarta.persistence.GeneratedValue;
3435
import jakarta.persistence.GenerationType;
3536
import jakarta.persistence.Id;
3637
import jakarta.persistence.Table;
3738
import jakarta.persistence.Transient;
3839

40+
@Profile("!swagger")
3941
@Entity
4042
@Table(name = "fact_bencall", schema = "db_reporting")
4143
public class SecondaryCallReport implements Serializable

0 commit comments

Comments
 (0)