Revert "Merge pull request #20 from sunbird-cb/wat_telemetry"

This reverts commit 5d13c5b, reversing changes made to 74690ad.
sunbird-cb · Sep 17, 2021 · 29052ca · 29052ca
1 parent 5d13c5b
commit 29052ca
Show file tree

Hide file tree

Showing 21 changed files with 250 additions and 927 deletions.
diff --git a/Jenkinsfile-sun b/Jenkinsfile-sun
@@ -1,5 +1,5 @@
 @Library('deploy-conf') _
-node() {
+node('build-slave') {
     try {
         String ANSI_GREEN = "\u001B[32m"
         String ANSI_NORMAL = "\u001B[0m"
@@ -15,19 +15,21 @@ node() {
                     } else
                         println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
                 }
+
                 cleanWs()
                 checkout scm
                 commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-	        build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
+                build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
                 echo "build_tag: " + build_tag
-
+        
         stage('docker-pre-build') {
             sh '''
-	    docker build -f ./Dockerfile.build -t $docker_pre_build .
-	    docker run --name $docker_pre_build $docker_pre_build:latest && docker cp $docker_pre_build:/opt/target/sb-cb-ext-0.0.1-SNAPSHOT.jar .
-	    sleep 30
-	    docker rm -f $docker_pre_build
-	    docker rmi -f $docker_pre_build
+
+				docker build -f ./Dockerfile.build -t $docker_pre_build .
+				docker run --name $docker_pre_build $docker_pre_build:latest && docker cp $docker_pre_build:/opt/target/sb-cb-ext-0.0.1-SNAPSHOT.jar .
+				sleep 30
+				docker rm -f $docker_pre_build
+				docker rmi -f $docker_pre_build
             '''
         }
         stage('Build') {
@@ -36,13 +38,13 @@ node() {
                 sh('chmod 777 build.sh')
                 sh("bash -x build.sh ${build_tag} ${env.NODE_NAME} ${docker_server}")
             }
-                        stage('ArchiveArtifacts') {
+        stage('ArchiveArtifacts') {
                     archiveArtifacts "metadata.json"
                     currentBuild.description = "${build_tag}"
                 }
 
       }
-        
+
 	}
     catch (err) {
         currentBuild.result = "FAILURE"

diff --git a/README.md b/README.md
@@ -234,12 +234,3 @@ CREATE TABLE work_allocation(
     PRIMARY KEY (id)
 );
 ```
-```sh
-CREATE TABLE user_work_allocation_mapping(
-    userid text,
-    workallocationid text,
-    workorderid text,
-    status text,
-    PRIMARY KEY (userid, workallocationid)
-);
-```
diff --git a/src/main/java/org/sunbird/common/util/CbExtServerProperties.java b/src/main/java/org/sunbird/common/util/CbExtServerProperties.java
@@ -65,45 +65,45 @@ public class CbExtServerProperties {
 
     @Value("${kafka.topics.org.creation}")
     private String orgCreationKafkaTopic;
-
+    
     @Value("${km.base.host}")
     private String kmBaseHost;
-
+    
     @Value("${km.base.framework.path}")
     private String kmFrameWorkPath;
-
+    
     @Value("${frac.host}")
     private String fracHost;
-
+    
     @Value("${frac.node.path}")
     private String fracNodePath;
-
+    
     @Value("${frac.activity.path}")
     private String fracActivityPath;
-
+    
     @Value("${frac.node.source}")
     private String fracSource;
-
+    
     @Value("${frac.node.source.useDeptName}")
     private boolean fracSourceUseDeptName;
-
+    
     @Value("${igot.taxonomy.framework.name}")
     private String taxonomyFrameWorkName;
-
+    
     @Value("${igot.taxonomy.category.name}")
     private String taxonomyCategoryName;
 
     @Value("${kafka.topics.userrole.audit}")
     private String userRoleAuditTopic;
-
+    
     @Value("${content-service-host}")
-    private String contentHost;
+	private String contentHost;
 
-    @Value("${content-hierarchy-endpoint}")
-    private String hierarchyEndPoint;
-
-    @Value("${participants.api.endpoint}")
-    private String participantsEndPoint;
+	@Value("${content-hierarchy-endpoint}")
+	private String hierarchyEndPoint;
+	
+	@Value("${participants.api.endpoint}")
+	private String participantsEndPoint;
 
     @Value("${course.batch.create.endpoint}")
     private String courseBatchCreateEndpoint;
@@ -126,37 +126,24 @@ public class CbExtServerProperties {
 
     @Value("${content.default.orgId}")
     private String contentDefaultOrgId;
-
-    @Value("${kafka.topics.wat.telemetry.event}")
-    private String kafkaTopicWatEvent;
-
-    @Value("${sunbird.telemetry.base.url}")
-    private String telemetryBaseUrl;
-
-    @Value("${sunbird.telemetry.endpoint}")
-    private String telemetryEndpoint;
-
-    @Value("${wat.telemetry.env}")
-    private String watTelemetryEnv;
-
-
+
     public String getContentHost() {
-        return contentHost;
-    }
+		return contentHost;
+	}
 
-    public void setContentHost(String contentHost) {
-        this.contentHost = contentHost;
-    }
+	public void setContentHost(String contentHost) {
+		this.contentHost = contentHost;
+	}
 
-    public String getHierarchyEndPoint() {
-        return hierarchyEndPoint;
-    }
+	public String getHierarchyEndPoint() {
+		return hierarchyEndPoint;
+	}
 
-    public void setHierarchyEndPoint(String hierarchyEndPoint) {
-        this.hierarchyEndPoint = hierarchyEndPoint;
-    }
+	public void setHierarchyEndPoint(String hierarchyEndPoint) {
+		this.hierarchyEndPoint = hierarchyEndPoint;
+	}
 
-    public String getWfServiceHost() {
+	public String getWfServiceHost() {
         return wfServiceHost;
     }
 
@@ -315,78 +302,78 @@ public String getOrgCreationKafkaTopic() {
     public void setOrgCreationKafkaTopic(String orgCreationKafkaTopic) {
         this.orgCreationKafkaTopic = orgCreationKafkaTopic;
     }
-
+    
     public String getKmBaseHost() {
-        return kmBaseHost;
-    }
-
-    public void setKmBaseHost(String kmBaseHost) {
-        this.kmBaseHost = kmBaseHost;
-    }
-
-    public String getKmFrameWorkPath() {
-        return kmFrameWorkPath;
-    }
-
-    public void setKmFrameWorkPath(String kmFrameWorkPath) {
-        this.kmFrameWorkPath = kmFrameWorkPath;
-    }
-
-    public String getFracHost() {
-        return fracHost;
-    }
-
-    public void setFracHost(String fracHost) {
-        this.fracHost = fracHost;
-    }
-
-    public String getFracNodePath() {
-        return fracNodePath;
-    }
-
-    public void setFracNodePath(String fracNodePath) {
-        this.fracNodePath = fracNodePath;
-    }
-
-    public String getFracActivityPath() {
-        return fracActivityPath;
-    }
-
-    public void setFracActivityPath(String fracActivityPath) {
-        this.fracActivityPath = fracActivityPath;
-    }
-
-    public String getFracSource() {
-        return fracSource;
-    }
-
-    public void setFracSource(String fracSource) {
-        this.fracSource = fracSource;
-    }
-
-    public boolean isFracSourceUseDeptName() {
-        return fracSourceUseDeptName;
-    }
-
-    public void setFracSourceUseDeptName(boolean fracSourceUseDeptName) {
-        this.fracSourceUseDeptName = fracSourceUseDeptName;
-    }
-
-    public String getTaxonomyFrameWorkName() {
-        return taxonomyFrameWorkName;
-    }
-
-    public void setTaxonomyFrameWorkName(String taxonomyFrameWorkName) {
-        this.taxonomyFrameWorkName = taxonomyFrameWorkName;
-    }
-
-    public String getTaxonomyCategoryName() {
-        return taxonomyCategoryName;
-    }
-
-    public void setTaxonomyCategoryName(String taxonomyCategoryName) {
-        this.taxonomyCategoryName = taxonomyCategoryName;
-    }
+		return kmBaseHost;
+	}
+
+	public void setKmBaseHost(String kmBaseHost) {
+		this.kmBaseHost = kmBaseHost;
+	}
+
+	public String getKmFrameWorkPath() {
+		return kmFrameWorkPath;
+	}
+
+	public void setKmFrameWorkPath(String kmFrameWorkPath) {
+		this.kmFrameWorkPath = kmFrameWorkPath;
+	}
+	
+	public String getFracHost() {
+		return fracHost;
+	}
+
+	public void setFracHost(String fracHost) {
+		this.fracHost = fracHost;
+	}
+
+	public String getFracNodePath() {
+		return fracNodePath;
+	}
+
+	public void setFracNodePath(String fracNodePath) {
+		this.fracNodePath = fracNodePath;
+	}
+	
+	public String getFracActivityPath() {
+		return fracActivityPath;
+	}
+
+	public void setFracActivityPath(String fracActivityPath) {
+		this.fracActivityPath = fracActivityPath;
+	}
+
+	public String getFracSource() {
+		return fracSource;
+	}
+
+	public void setFracSource(String fracSource) {
+		this.fracSource = fracSource;
+	}
+
+	public boolean isFracSourceUseDeptName() {
+		return fracSourceUseDeptName;
+	}
+
+	public void setFracSourceUseDeptName(boolean fracSourceUseDeptName) {
+		this.fracSourceUseDeptName = fracSourceUseDeptName;
+	}
+	
+	public String getTaxonomyFrameWorkName() {
+		return taxonomyFrameWorkName;
+	}
+
+	public void setTaxonomyFrameWorkName(String taxonomyFrameWorkName) {
+		this.taxonomyFrameWorkName = taxonomyFrameWorkName;
+	}
+
+	public String getTaxonomyCategoryName() {
+		return taxonomyCategoryName;
+	}
+
+	public void setTaxonomyCategoryName(String taxonomyCategoryName) {
+		this.taxonomyCategoryName = taxonomyCategoryName;
+	}
 
     public String getUserRoleAuditTopic() {
         return userRoleAuditTopic;
@@ -395,14 +382,14 @@ public String getUserRoleAuditTopic() {
     public void setUserRoleAuditTopic(String userRoleAuditTopic) {
         this.userRoleAuditTopic = userRoleAuditTopic;
     }
-
+    
     public String getParticipantsEndPoint() {
-        return participantsEndPoint;
-    }
+		return participantsEndPoint;
+	}
 
-    public void setParticipantsEndPoint(String participantsEndPoint) {
-        this.participantsEndPoint = participantsEndPoint;
-    }
+	public void setParticipantsEndPoint(String participantsEndPoint) {
+		this.participantsEndPoint = participantsEndPoint;
+	}
 
     public String getCourseBatchCreateEndpoint() {
         return courseBatchCreateEndpoint;
@@ -470,36 +457,4 @@ public String getContentDefaultOrgId() {
     public void setContentDefaultOrgId(String contentDefaultOrgId) {
         this.contentDefaultOrgId = contentDefaultOrgId;
     }
-
-    public String getKafkaTopicWatEvent() {
-        return kafkaTopicWatEvent;
-    }
-
-    public void setKafkaTopicWatEvent(String kafkaTopicWatEvent) {
-        this.kafkaTopicWatEvent = kafkaTopicWatEvent;
-    }
-
-    public String getTelemetryBaseUrl() {
-        return telemetryBaseUrl;
-    }
-
-    public void setTelemetryBaseUrl(String telemetryBaseUrl) {
-        this.telemetryBaseUrl = telemetryBaseUrl;
-    }
-
-    public String getTelemetryEndpoint() {
-        return telemetryEndpoint;
-    }
-
-    public void setTelemetryEndpoint(String telemetryEndpoint) {
-        this.telemetryEndpoint = telemetryEndpoint;
-    }
-
-    public String getWatTelemetryEnv() {
-        return watTelemetryEnv;
-    }
-
-    public void setWatTelemetryEnv(String watTelemetryEnv) {
-        this.watTelemetryEnv = watTelemetryEnv;
-    }
 }
diff --git a/src/main/java/org/sunbird/workallocation/controller/AllocationControllerV2.java b/src/main/java/org/sunbird/workallocation/controller/AllocationControllerV2.java
@@ -72,9 +72,4 @@ public ResponseEntity<Response> getUserBasicInfo(@PathVariable("userId") String
         return new ResponseEntity<>(allocationServiceV2.getUserBasicDetails(userId), HttpStatus.OK);
     }
 
-    @GetMapping("/user/competencies/{userId}")
-    public ResponseEntity<Response> getUserCompetencies(@PathVariable("userId") String userId) throws IOException {
-        return new ResponseEntity<>(allocationServiceV2.getUserCompetencies(userId), HttpStatus.OK);
-    }
-
 }