Extend VBase clients with conflict handler endpoints

Author: vitorflg

CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Updated
+- Extend VBase client, integrating the `getConflicts` and the `resolveConflict` endpoints.
 
 ## [2.128.0] - 2021-05-25
 

src/api/clients/IOClients/infra/VBase.ts

@@ -2,8 +2,9 @@ import { InfraClient, InstanceOptions, IOContext } from '@vtex/api'
 import { IOClientFactory } from '../IOClientFactory'
 
 const routes = {
-  Bucket: (bucket: string) => `/buckets/${bucket}`,
-  File: (bucket: string, path: string) => `${routes.Bucket(bucket)}/userData/files/${path}`,
+  Bucket: (bucket: string) => `${bucket}`,
+  File: (bucket: string, path: string) => `buckets/${routes.Bucket(bucket)}/files/${path}`,
+  Conflicts: (bucket: string) => `buckets/${routes.Bucket(bucket)}/conflicts`,
 }
 
 export class VBase extends InfraClient {
@@ -21,10 +22,30 @@ export class VBase extends InfraClient {
     })
   }
 
+  public resolveConflict = (bucketKey: string, path: string, content: any) => {
+    const data = [
+      {
+        op: 'replace',
+        path,
+        value: content,
+      },
+    ]
+
+    return this.http.patch(routes.Conflicts(`vtex.pages-graphql/${bucketKey}`), data, {
+      metric: 'vbase-resolve-conflicts',
+    })
+  }
+
+  public getConflicts = async () => {
+    return this.http.get(routes.Conflicts('vtex.pages-graphql/userData'), {
+      metric: 'vbase-get-conflicts',
+    })
+  }
+
   public checkForConflicts = async () => {
     let status: number
     try {
-      const response = await this.http.get(routes.File('vtex.pages-graphql', 'store/content.json'), {
+      const response = await this.http.get(routes.File('vtex.pages-graphql/userData', 'store/content.json'), {
         metric: 'vbase-conflict',
       })
       status = response.status