Merge pull request sunbird-cb#222 from KB-iGOT/dev-4.8.19

Dev 4.8.19

ansible/roles/kong-api/defaults/main.yml

@@ -141,6 +141,7 @@ comment_prefix: /comment
 organisation_prefix: /organisation
 public_assessment_prefix: /public/assessment
 event_progress_prefix: /eventprogress
+blended_program_prefix: /bp
 
 # Service URLs
 knowledge_mw_service_url: "http://knowledge-mw-service:5000"
@@ -18439,7 +18440,7 @@ kong_apis:
         config.limit_by: credential
       - name: request-size-limiting
         config.allowed_payload_size: "{{ small_request_size_limit }}"
-
+       
   - name: serviceRegistryConfigUpdate
     uris: "{{ service_registry_prefix }}/config/update"
     upstream_url: "{{ cb_service_registry_url }}/serviceregistry/config/update"
@@ -18457,7 +18458,7 @@ kong_apis:
         config.limit_by: credential
       - name: request-size-limiting
         config.allowed_payload_size: "{{ small_request_size_limit }}"
-
+        
   - name: serviceRegistryConfigRead
     uris: "{{ service_registry_prefix }}/config/read"
     upstream_url: "{{ cb_service_registry_url }}/serviceregistry/config/read"
@@ -18474,4 +18475,58 @@ kong_apis:
         config.hour: "{{ medium_rate_limit_per_hour }}"
         config.limit_by: credential
       - name: request-size-limiting
-        config.allowed_payload_size: "{{ small_request_size_limit }}"
+        config.allowed_payload_size: "{{ small_request_size_limit }}"        
+
+  - name: bpUserEnrollmentReportGenerate
+    uris: "{{ blended_program_prefix }}/v1/generate/report"
+    upstream_url: "{{ sb_cb_ext_service_url }}/bp/v1/generate/report"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'reportsCreate'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: bpUserEnrollmentReportStatus
+    uris: "{{ blended_program_prefix }}/v1/bpreport/status"
+    upstream_url: "{{ sb_cb_ext_service_url }}/bp/v1/bpreport/status"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'reportsAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: bpUserEnrollmentReportDownload
+    uris: "{{ blended_program_prefix }}/v1/bpreport/download"
+    upstream_url: "{{ sb_cb_ext_service_url }}/bp/v1/bpreport/download/"
+    strip_uri: true
+    plugins:
+      - name: jwt
+      - name: cors
+      - "{{ statsd_pulgin }}"
+      - name: acl
+        config.whitelist:
+          - 'dataAccess'
+      - name: rate-limiting
+        config.policy: local
+        config.hour: "{{ medium_rate_limit_per_hour }}"
+        config.limit_by: credential
+      - name: request-size-limiting
+        config.allowed_payload_size: "{{ medium_request_size_limit }}"

ansible/roles/stack-sunbird/templates/sunbird_lms-service.env

@@ -170,7 +170,7 @@ content_bucket=/content-store/content
 static_host_url={{ cloud_storage_endpoint }}
 profile_update_url=/app/user-profile/details
 
-enrol_list_fields=contentType,name,channel,mimeType,appIcon,resourceType,identifier,trackable,objectType,organisation,pkgVersion,version,trackable,primaryCategory,posterImage,duration,creatorLogo,license,programDuration,avgRating,batches,endDate,startDate,status,enrollmentType,createdBy,certificates,competencies_v5,firstChildId,leafNodesCount,courseCategory
+enrol_list_fields=contentType,name,channel,mimeType,appIcon,resourceType,identifier,trackable,objectType,organisation,pkgVersion,version,trackable,primaryCategory,posterImage,duration,creatorLogo,license,programDuration,avgRating,batches,endDate,startDate,status,enrollmentType,createdBy,certificates,competencies_v5,firstChildId,leafNodesCount,courseCategory,competencies_v6
 
 number_of_records_per_trip_content_cache_load=200
 addExtraHrsAndMins.start_date_end_date=false

kubernetes/helm_charts/igot-deploy/cios-content-service/files/cios-content-service-env.j2

@@ -78,3 +78,5 @@ kafka.topic.content.onboarding={{ env }}.cios.content.onboard
 
 cb.pores.service.url=http://cb-pores-service:7001
 partner.create.update.path=/contentpartner/v1/create
+
+cloud.profile.image.container.name={{ sbworkflow_cloud_storage_content_bucketname }}

kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2

@@ -481,3 +481,13 @@ cios.cloud.folder.name=partner
 
 framework.read.endpoint=v1/framework/read/
 
+wingspan.datasource.jdbc-url=jdbc:postgresql://{{postgresql_host}}:{{ postgresql_port }}/{{ postgresql_wingspan_database }}
+wingspan.datasource.username={{ postgresql_username_wingspan }}
+wingspan.datasource.password={{ postgresql_password_wingspan }}
+wingspan.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+wingspan.datasource.driver-class-name=org.postgresql.Driver
+wingspan.jpa.properties.hibernate.format_sql=true
+wingspan.jpa.show-sql=false
+igot.es.user.form.index=fs-forms-data
+es.form.index.type=_doc
+bp.user.enrolment.report.container.name=gcpbpreports