Codes field added to issue_instance model

Summary: Matching output for IssueResults, codes added as field in issue_instance model and obtained by querying issue table

Reviewed By: sinancepel

Differential Revision: D22743967

fbshipit-source-id: ff2e7bcf84e059e660c4cb205da09db7fe4fb6fc

Author: Nolan Alexander Jimenez

tools/sapp/sapp/frontend/src/App.js

@@ -17,57 +17,53 @@ const client = new ApolloClient({
 function IssueInstances() {
   const {loading, error, data} = useQuery(gql`
     {
-      issueInstances {
-        location
-        filenameId
-        filename
-        callableId
-        isNewIssue
-        runId
-        issueId
-        messageId
-        minTraceLengthToSources
-        minTraceLengthToSinks
-        minTraceLengthToEntrypoints
-        rank
-        callableCount
+      issueInstances{
+        edges {
+          node {
+            location
+            filenameId
+            filename {
+              contents
+            }
+            callableId
+            isNewIssue
+            runId
+            issueId
+            messageId
+            minTraceLengthToSources
+            minTraceLengthToSinks
+            rank
+            callableCount
+            minTraceLengthToEntrypoints
+            issue {
+              code
+            }
+          }
+        }
       }
     }
   `);
 
   if (loading) return <p>Loading...</p>;
   if (error) return <p>Error :(</p>;
 
-  return data.issueInstances.map(
-    ({
-      location,
-      filenameId,
-      filename,
-      callableId,
-      isNewIssue,
-      runId,
-      issueId,
-      messageId,
-      minTraceLengthToSources,
-      minTraceLengthToSinks,
-      rank,
-      callableCount,
-      minTraceLengthToEntrypoints,
-    }) => (
+  return data.issueInstances.edges.map(
+    ({node}) => (
         <IssueInstance
-          location={location}
-          filenameId={filenameId}
-          filename={filename}
-          callableId={callableId}
-          isNewIssue={isNewIssue}
-          runId={runId}
-          issueId={issueId}
-          messageId={issueId}
-          minTraceLengthToSources={minTraceLengthToSources}
-          minTraceLengthToSinks={minTraceLengthToSinks}
-          rank={rank}
-          callableCount={callableCount}
-          minTraceLengthToEntrypoints={minTraceLengthToEntrypoints}
+          location={node.location}
+          filenameId={node.filenameId}
+          filename={node.filename.contents}
+          code={node.issue.code}
+          callableId={node.callableId}
+          isNewIssue={node.isNewIssue}
+          runId={node.runId}
+          issueId={node.issueId}
+          messageId={node.issueId}
+          minTraceLengthToSources={node.minTraceLengthToSources}
+          minTraceLengthToSinks={node.minTraceLengthToSinks}
+          rank={node.rank}
+          callableCount={node.callableCount}
+          minTraceLengthToEntrypoints={node.minTraceLengthToEntrypoints}
         />
     ),
   );

tools/sapp/sapp/frontend/src/IssueInstance.js

@@ -8,6 +8,7 @@ class IssueInstance extends React.Component {
         <p>Location: {this.props.location}</p>
         <p>File: {this.props.filename}</p>
         <p>Filename Id: {this.props.filenameId}</p>
+        <p>Code: {this.props.code}</p>
         <p>Callable Id: {this.props.callableId}</p>
         <p>Callable Count: {this.props.callableCount}</p>
         <p>isNewIssue: {this.props.isNewIssue}</p>

tools/sapp/sapp/models.py

@@ -337,7 +337,7 @@ def merge(cls, session, items):
         )
 
     @classmethod
-    def generateSQLAlchemyObject(cls):
+    def generateSQLAlchemyObject(cls) -> Type[SQLAlchemyObjectType]:
         class SharedTextType(SQLAlchemyObjectType):
             class Meta:
                 model = cls
@@ -536,7 +536,7 @@ def merge(cls, session, items):
             yield i
 
     @classmethod
-    def generateSQLAlchemyObject(cls):
+    def generateSQLAlchemyObject(cls) -> Type[SQLAlchemyObjectType]:
         class IssueInstanceType(SQLAlchemyObjectType):
             class Meta:
                 model = cls
@@ -658,6 +658,15 @@ def _take(cls, n, iterable):
     def merge(cls, session, issues):
         return cls._merge_by_key(session, issues, cls.handle)
 
+    @classmethod
+    def generateSQLAlchemyObject(cls) -> Type[SQLAlchemyObjectType]:
+        class IssueType(SQLAlchemyObjectType):
+            class Meta:
+                model = cls
+                interfaces = (relay.Node,)
+
+        return IssueType
+
 
 class RunStatus(enum.Enum):
     # Do NOT reorder the enums. Depending on the type of database, existing

tools/sapp/sapp/schema.py

@@ -5,7 +5,11 @@
 import graphene
 from graphene import relay
 
-from .models import IssueInstance, SharedText
+from .models import Issue, IssueInstance, SharedText
+
+
+if TYPE_CHECKING:
+    from graphql.execution.base import ResolveInfo
 
 
 if TYPE_CHECKING:
@@ -14,6 +18,7 @@
 
 SharedTextType = SharedText.generateSQLAlchemyObject()
 IssueInstanceType = IssueInstance.generateSQLAlchemyObject()
+IssueType = Issue.generateSQLAlchemyObject()
 
 
 class IssueConnection(relay.Connection):