fix(rn): update conversation

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Dec 11, 2018 · 02b784e · 02b784e
1 parent 94d34b5
commit 02b784e
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 34 deletions.
diff --git a/client/react-native/android/ble/src/main/java/chat/berty/ble/BertyDevice.java b/client/react-native/android/ble/src/main/java/chat/berty/ble/BertyDevice.java
@@ -22,7 +22,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.Semaphore;
 
-import core.Core;
+////import core.Core;
 
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
 public class BertyDevice {
@@ -71,7 +71,7 @@ public void run() {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
                     try {
                         latchRdy.await();
-                        Core.addToPeerStore(peerID, ma);
+////                        Core.addToPeerStore(peerID, ma);
                     } catch (Exception e) {
                         BertyUtils.logger("error", TAG, "waiting/writing failed: " + e.getMessage());
                     }

diff --git a/client/react-native/android/ble/src/main/java/chat/berty/ble/BertyGattServer.java b/client/react-native/android/ble/src/main/java/chat/berty/ble/BertyGattServer.java
@@ -17,7 +17,7 @@
 import java.nio.charset.Charset;
 import java.util.UUID;
 
-import core.Core;
+////import core.Core;
 
 import static android.bluetooth.BluetoothGatt.GATT_FAILURE;
 import static android.bluetooth.BluetoothGatt.GATT_SUCCESS;
@@ -164,7 +164,7 @@ public void onCharacteristicWriteRequest(BluetoothDevice device, int requestId,
         BertyDevice bDevice = BertyUtils.getDeviceFromAddr(device.getAddress());
         if (charID.equals(BertyUtils.WRITER_UUID)) {
             BertyUtils.logger("debug", TAG, "rep needed: " + responseNeeded + "prepared: " + preparedWrite + " transid: " + requestId  + " offset: " + offset + " len: " + value.length);
-            Core.bytesToConn(bDevice.ma, value);
+////            Core.bytesToConn(bDevice.ma, value);
             if (responseNeeded) {
                 mBluetoothGattServer.sendResponse(device, requestId, GATT_SUCCESS, offset, value);
             }

diff --git a/client/react-native/android/ble/src/main/java/chat/berty/ble/BertyUtils.java b/client/react-native/android/ble/src/main/java/chat/berty/ble/BertyUtils.java
@@ -20,7 +20,7 @@
 import static android.bluetooth.BluetoothGattCharacteristic.PROPERTY_WRITE;
 import static android.bluetooth.BluetoothGattService.SERVICE_TYPE_PRIMARY;
 
-import core.Core;
+////import core.Core;
 
 @SuppressLint("LongLogTag")
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
@@ -40,7 +40,7 @@ public class BertyUtils {
     private static final String TAG = "utils";
 
     public static void logger(String level, String tag, String log) {
-        Core.goLogger(tag, level, log);
+////        Core.goLogger(tag, level, log);
     }
 
     public String ma;

diff --git a/client/react-native/common/components/Screens/Settings/About/List.js b/client/react-native/common/components/Screens/Settings/About/List.js
@@ -14,7 +14,7 @@ export default class List extends PureComponent {
 
   componentDidMount () {
     this.props.screenProps.context.queries.AppVersion.fetch().then(data => {
-      this.setState({ version: data.AppVersion.version })
+      this.setState({ version: data.version })
     })
   }
 

diff --git a/client/react-native/common/components/Screens/Settings/Devtools/DeviceInfos.js b/client/react-native/common/components/Screens/Settings/Devtools/DeviceInfos.js
@@ -37,7 +37,7 @@ export default class DeviceInfos extends PureComponent {
     this.setState({ refreshing: true }, async () => {
       console.log(queries)
       const data = await queries.DeviceInfos.fetch()
-      this.setState({ infos: data.DeviceInfos.infos, refreshing: false })
+      this.setState({ infos: data.infos, refreshing: false })
     })
   }
 

diff --git a/client/react-native/common/components/Screens/Settings/Devtools/Network/Peers.js b/client/react-native/common/components/Screens/Settings/Devtools/Network/Peers.js
@@ -93,7 +93,7 @@ export default class Peers extends Component {
 
   fetchPeers = () => {
     this.props.screenProps.context.queries.Peers.fetch().then(data =>
-      this.updatePeers(data.Peers.list)
+      this.updatePeers(data.list)
     )
   }
 

diff --git a/client/react-native/common/graphql/subscriptions/ConversationInvite.js b/client/react-native/common/graphql/subscriptions/ConversationInvite.js
@@ -1,7 +1,3 @@
-import { btoa } from 'b64-lite'
-
-import { parseEmbedded } from '../../helpers/json'
-import { queries } from '..'
 import EventStream from './EventStream'
 
 export default context => ({
@@ -12,12 +8,9 @@ export default context => ({
         updater &&
         (async (store, data) => {
           if (data.EventStream.kind === 301) {
-            const attributes = parseEmbedded(data.EventStream.attributes)
-            attributes.conversation.id = btoa(
-              'conversation:' + attributes.conversation.id
-            )
-            const conversation = await queries(context).Conversation.fetch({
-              id: attributes.conversation.id,
+            console.log(data.EventStream)
+            const conversation = await context.queries.Conversation.fetch({
+              id: data.EventStream.conversationId,
             })
 
             console.log('ConversationInvite: conversation: ', conversation)

diff --git a/client/react-native/common/graphql/subscriptions/ConversationNewMessage.js b/client/react-native/common/graphql/subscriptions/ConversationNewMessage.js
@@ -1,5 +1,4 @@
 import EventStream from './EventStream'
-import { queries } from '..'
 
 export default context => ({
   ...EventStream(context),
@@ -9,7 +8,7 @@ export default context => ({
         updater &&
         (async (store, data) => {
           if (data.EventStream.kind === 302) {
-            const conversation = await queries(context).Conversation.fetch({
+            const conversation = await context.queries.Conversation.fetch({
               id: data.EventStream.conversationId,
             })
             console.log('ConversationNewMessage: conversation:', conversation)

diff --git a/client/react-native/common/relay/genericUpdater.js b/client/react-native/common/relay/genericUpdater.js
@@ -47,21 +47,26 @@ export default (fragment, alias, args) => {
       ConnectionHandler.deleteNode(connection, data.id)
       return
     }
-    console.log(args)
+
     // get all edges
+    const node =
+      store.get(data.id) ||
+      store.create(data.id, connectionHelper.getEdgeNodeType())
+    console.log('node', node)
     const edges = connection.getLinkedRecords('edges')
     const field = Case.camel(args.orderBy || args.sortBy || 'id')
     const cursor =
-      field === 'id' ? atob(data.id).split(/:(.+)/)[1] : data[field]
+      field === 'id'
+        ? atob(node.getValue('id')).split(/:(.+)/)[1]
+        : node.getValue(field)
+    console.log('cursor', cursor)
     if (edges.length > 0 && edges.some(e => e.getValue('cursor') === cursor)) {
       // update
       return
     }
 
+    console.log('add connection', { connection })
     // add
-    const node =
-      store.get(data.id) ||
-      store.create(data.id, connectionHelper.getEdgeNodeType())
     const edge = ConnectionHandler.createEdge(
       store,
       connection,
@@ -71,9 +76,11 @@ export default (fragment, alias, args) => {
     edge.setValue(cursor, 'cursor')
 
     if (connectionHelper.direction === 'forward' && args.orderDesc === false) {
+      console.log('forward')
       ConnectionHandler.insertEdgeAfter(connection, edge, cursor)
       return
     }
+    console.log('backward')
     ConnectionHandler.insertEdgeBefore(connection, edge, cursor)
   }
 }
diff --git a/core/node/nodeapi.go b/core/node/nodeapi.go
@@ -131,8 +131,8 @@ func (n *Node) GetEvent(ctx context.Context, input *gql.Node) (*p2p.Event, error
 	n.handleMutex(ctx)()
 
 	sql := n.sql(ctx)
-	var event *p2p.Event
-	if err := sql.First(event, "ID = ?", input.ID).Error; err != nil {
+	event := &p2p.Event{}
+	if err := sql.Where(input).First(event).Error; err != nil {
 		return nil, errorcodes.ErrDbNothingFound.Wrap(err)
 	}
 
@@ -337,8 +337,8 @@ func (n *Node) GetContact(ctx context.Context, input *gql.Node) (*entity.Contact
 	n.handleMutex(ctx)()
 
 	sql := n.sql(ctx)
-	var contact *entity.Contact
-	if err := sql.First(contact, "ID = ?", input.ID).Error; err != nil {
+	contact := &entity.Contact{}
+	if err := sql.Where(input).First(contact).Error; err != nil {
 		return nil, errorcodes.ErrDb.Wrap(err)
 	}
 
@@ -517,8 +517,8 @@ func (n *Node) GetConversation(ctx context.Context, input *gql.Node) (*entity.Co
 	n.handleMutex(ctx)()
 
 	sql := n.sql(ctx)
-	var conversation *entity.Conversation
-	if err := sql.First(conversation, "ID = ?", input.ID).Error; err != nil {
+	conversation := &entity.Conversation{}
+	if err := sql.Where(input).First(conversation).Error; err != nil {
 		return nil, errorcodes.ErrDbNothingFound.Wrap(err)
 	}
 
@@ -533,8 +533,8 @@ func (n *Node) GetConversationMember(ctx context.Context, input *gql.Node) (*ent
 	n.handleMutex(ctx)()
 
 	sql := n.sql(ctx)
-	var conversationMember *entity.ConversationMember
-	if err := sql.First(conversationMember, "ID = ?", input.ID).Error; err != nil {
+	conversationMember := &entity.ConversationMember{}
+	if err := sql.Where(input).First(conversationMember).Error; err != nil {
 		return nil, errorcodes.ErrDbNothingFound.Wrap(err)
 	}