fixing reset branch url

Author: KittyJose

lib/connectionConfig.js

@@ -386,29 +386,19 @@ ConnectionConfig.prototype.squashBranchURL = function(nuid) {
     return b + `/branch/${nuid}`
 }
 
-
 /**
- * Generate URL for optimizing system
+ * Generate URL for branch reset endpoint
  */
-ConnectionConfig.prototype.optimizeSystemUrl = function() {
-    let o = this.optimizeBase()
-    return o + `_system`
-}
-
-/**
- * Generate URL for optimizing db meta
- */
-ConnectionConfig.prototype.optimizeMetaUrl = function() {
-    let o = this.optimizeBase()
-    return o + `${this.user()}/${this.db()}/_meta`
+ConnectionConfig.prototype.resetBranchUrl = function(nuid) {
+    let b = this.repoBase('reset')
+    return b + `/branch/${nuid}`
 }
 
 /**
- * Generate URL for optimizing db commits
+ * Generate URL for commit descriptor
  */
-ConnectionConfig.prototype.optimizeCommitUrl = function() {
-    let o = this.optimizeBase()
-    return o + `${this.user()}/${this.db()}/${this.repoid}/_commits`
+ConnectionConfig.prototype.commitDescriptorUrl = function(cid) {
+    return `${this.user()}/${this.db()}/${this.repoid}/commit/${cid}`
 }
 
 /**

lib/woqlClient.js

@@ -591,46 +591,23 @@ WOQLClient.prototype.squashBranch = function(branch_id, commit_msg) {
  * @param {string} commit_descriptor - a valid commit descriptor
  * @returns {Promise}
  */
-WOQLClient.prototype.resetBranch = function(branch_id, commit_descriptor) {
-    if (commit_descriptor && branch_id) {
-        let commit = this.generateCommitDescriptor(commit_descriptor)
-        return this.dispatch(CONST.RESET_BRANCH, this.connectionConfig.squashBranchURL(), commit)
+WOQLClient.prototype.resetBranch = function(branch_id, commit_id) {
+    if (commit_id && branch_id) {
+        let commit_descriptor = this.generateCommitDescriptor(commit_id)
+        return this.dispatch(CONST.RESET_BRANCH, this.connectionConfig.resetBranchUrl(branch_id), commit_descriptor)
     }
     let errmsg = `Branch parameter error - you must specify a valid new branch id and a commit message`
     return Promise.reject(new Error(ErrorMessage.getInvalidParameterMessage(CONST.RESET_BRANCH, errmsg)))
 }
 
-/**
- * Optimize system
- * @returns {Promise}
- */
-WOQLClient.prototype.optimize_system = function() {
-    return this.dispatch(CONST.OPTIMIZE_SYSTEM, this.connectionConfig.optimizeSystemUrl())
-}
 
-/**
- * Optimize db meta
- * @returns {Promise}
- */
-WOQLClient.prototype.optimize_meta = function() {
-    return this.dispatch(CONST.OPTIMIZE_SYSTEM, this.connectionConfig.optimizeMetaUrl())
-}
-
-/**
- * Optimize db commits
- * @returns {Promise}
- */
-WOQLClient.prototype.optimize_commit = function() {
-    return this.dispatch(CONST.OPTIMIZE_SYSTEM, this.connectionConfig.optimizeCommitUrl())
-}
 
 /**
  * Optimize db branch
  * @param {string} branch_id - local identifier of the new branch
  * @returns {Promise}
  */
 WOQLClient.prototype.optimize_branch = function(branch_id) {
-    console.log("this.connectionConfig.optimizeBranchUrl(branch_id)",this.connectionConfig.optimizeBranchUrl(branch_id))
     return this.dispatch(CONST.OPTIMIZE_SYSTEM, this.connectionConfig.optimizeBranchUrl(branch_id))
 }
 
@@ -763,8 +740,9 @@ WOQLClient.prototype.generateCommitInfo = function(msg, author) {
  * Generates the json structure for commit descriptor
  * @param {string} commit_descriptor - a valid commit descriptor
  */
-WOQLClient.prototype.generateCommitDescriptor=function(commit_descriptor) {
-    let ci = {commit_descriptor: commit_descriptor}
+WOQLClient.prototype.generateCommitDescriptor = function(commit_id) {
+    let cd = this.connectionConfig.commitDescriptorUrl(commit_id)
+    let ci = {commit_descriptor: cd}
     return ci
 }