Merge pull request #933 from mapswipe/feature/graphql-add-id

Feature/graphql add

Author: thenav56

community-dashboard/app/components/ItemSelectInput/index.tsx

@@ -36,6 +36,7 @@ const USERS = gql`
 query UserOptions($search: String, $offset: Int!, $limit: Int!) {
     users(filters: { search: $search }, pagination: { limit: $limit, offset: $offset }) {
         items {
+            id
             userId
             username
         }
@@ -50,6 +51,7 @@ const USER_GROUPS = gql`
 query UserGroupOptions($search: String, $offset: Int!, $limit: Int!) {
     userGroups(filters: { search: $search }, pagination: { limit: $limit, offset: $offset }) {
         items {
+            id
             isArchived
             userGroupId
             name

community-dashboard/app/views/UserGroupDashboard/index.tsx

@@ -32,12 +32,14 @@ const EXPORT_LIMIT = 500;
 const USER_GROUP_STATS = gql`
     query UserGroupStats($pk: ID!, $limit: Int!, $offset: Int!) {
         userGroup(pk: $pk) {
+            id
             userGroupId
             name
             description
             userMemberships(pagination: { limit: $limit, offset: $offset }) {
                 count
                 items {
+                    id
                     userId
                     username
                     isActive
@@ -48,6 +50,7 @@ const USER_GROUP_STATS = gql`
             }
         }
         userGroupStats(userGroupId: $pk) {
+            id
             stats {
                 totalContributors
                 totalSwipes
@@ -65,6 +68,7 @@ const USER_GROUP_STATS = gql`
 const FILTERED_USER_GROUP_STATS = gql`
     query FilteredUserGroupStats($pk: ID!, $fromDate: DateTime! $toDate: DateTime!) {
         userGroupStats(userGroupId: $pk) {
+            id
             filteredStats(dateRange: { fromDate: $fromDate, toDate: $toDate}) {
                 userStats {
                     totalMappingProjects
@@ -111,11 +115,13 @@ const USER_MEMBERSHIPS_EXPORT = gql`
         $offset: Int!,
     ) {
         userGroup(pk: $pk) {
+            id
             userMemberships(pagination: { limit: $limit, offset: $offset }) {
                 count
                 limit
                 offset
                 items {
+                    id
                     userId
                     username
                     isActive
@@ -215,11 +221,9 @@ function UserGroupDashboard(props: Props) {
             onCompleted: (response) => {
                 const result = response?.userGroup?.userMemberships;
                 const userMembershipsCount = response?.userGroup?.userMemberships?.count ?? 0;
+                const newUserMembershipsData = [...userMembershipsData, ...(result?.items ?? [])];
 
-                setUserMembershipsData((prevValue) => [...prevValue, ...result?.items ?? []]);
-                setOffset((prevValue) => prevValue + EXPORT_LIMIT);
-
-                if (userMembershipsData?.length < userMembershipsCount) {
+                if (newUserMembershipsData?.length < userMembershipsCount) {
                     setExportPending(true);
                     exportUserMembership({
                         variables: userGroupId ? ({
@@ -230,10 +234,10 @@ function UserGroupDashboard(props: Props) {
                     });
                 }
 
-                if (userMembershipsData?.length === userMembershipsCount) {
+                if (newUserMembershipsData.length === userMembershipsCount) {
                     const userGroupData = [
                         ['User', 'Total swipes', 'Project contributed', 'Time spent(mins)'],
-                        ...(userMembershipsData?.map((user) => (
+                        ...(newUserMembershipsData?.map((user) => (
                             [
                                 user.username,
                                 user.totalSwipes,
@@ -263,6 +267,8 @@ function UserGroupDashboard(props: Props) {
                     window.URL.revokeObjectURL(objUrl);
                     setExportPending(false);
                 }
+                setOffset((prevValue) => prevValue + EXPORT_LIMIT);
+                setUserMembershipsData(() => newUserMembershipsData);
             },
             onError: (err) => {
                 // NOTE: we don't show any alert on failure and success for now

django/apps/existing_database/test_queries.py

@@ -309,6 +309,7 @@ def test_user_query(self):
         query = """
             query MyQuery($userId: ID!, $pagination: OffsetPaginationInput!) {
               user(pk: $userId) {
+                id
                 userId
                 username
                 userInUserGroups(pagination: $pagination) {
@@ -391,6 +392,7 @@ def test_user_query(self):
             assert resp == {
                 "data": {
                     "user": {
+                        "id": user.user_id,
                         "userId": user.user_id,
                         "username": user.username,
                         "userInUserGroups": {

django/apps/existing_database/types.py

@@ -394,6 +394,10 @@ def __post_init__(self, user_group_id):
             user_group_id=user_group_id
         )
 
+    @strawberry.field
+    async def id(self) -> strawberry.ID:
+        return self._user_group_id
+
     @strawberry.field
     async def stats(self) -> UserGroupStatsType:
         agg_data = await self.qs.aaggregate(
@@ -449,12 +453,20 @@ class UserUserGroupMembershipType:
     user_group_name: str
     members_count: int
 
+    @strawberry.field
+    async def id(self, info: Info, root: UserGroup) -> strawberry.ID:
+        return f"{root.user_group_id}-{getattr(root, '_user_id', 'NA')}"
+
 
 @strawberry_django.type(User)
 class UserType:
     user_id: strawberry.ID
     username: strawberry.auto
 
+    @strawberry.field
+    async def id(self, info: Info, root: User) -> strawberry.ID:
+        return root.user_id
+
     @strawberry.field
     async def user_in_user_groups(
         self,
@@ -470,6 +482,7 @@ async def user_in_user_groups(
                 ).values("user_group_id")
             )
             .annotate(
+                _user_id=models.Value(root.user_id, output_field=models.CharField()),
                 user_group_name=models.F("name"),
                 members_count=models.functions.Coalesce(
                     models.Subquery(
@@ -512,9 +525,14 @@ class ProjectType:
     geom: str
     organization_name: str
 
+    @strawberry.field
+    async def id(self, info: Info, root: UserGroup) -> strawberry.ID:
+        return root.project_id
+
 
 @strawberry.type
 class UserGroupUserMembershipType:
+    id: strawberry.ID
     user_id: str
     username: str
     is_active: bool
@@ -535,6 +553,10 @@ class UserGroupType:
     archived_at: strawberry.auto
     is_archived: strawberry.auto
 
+    @strawberry.field
+    async def id(self, info: Info, root: UserGroup) -> strawberry.ID:
+        return root.user_group_id
+
     # TODO: Make this a generic module
     @strawberry.field
     async def user_memberships(
@@ -579,10 +601,14 @@ def _subquery_generator(agg_func):
             offset=pagination.offset,
             get_count=lambda: qs.acount(),
             queryset=[
-                UserGroupUserMembershipType(**item)
+                UserGroupUserMembershipType(
+                    id=f"{item['user_id']}-{item.pop('user_group_id')}",
+                    **item,
+                )
                 async for item in paginated_qs.values(
                     # NOTE: Defining manual select fields since DB doesn't have field id but Django assumes it has
                     "user_id",
+                    "user_group_id",
                     "is_active",
                     # Annotate fields
                     "username",

django/schema.graphql

@@ -75,6 +75,7 @@ type ProjectType {
   status: String
   geom: String
   organizationName: String
+  id: ID!
 }
 
 type ProjectTypeAreaStatsType {
@@ -182,6 +183,7 @@ input UserGroupOrder {
 }
 
 type UserGroupStats {
+  id: ID!
   stats: UserGroupStatsType!
 
   """Stats from last 30 days"""
@@ -207,6 +209,7 @@ type UserGroupType {
   createdAt: DateTime
   archivedAt: DateTime
   isArchived: Boolean
+  id: ID!
   userMemberships(pagination: OffsetPaginationInput!): UserGroupUserMembershipTypeCountList!
 }
 
@@ -218,6 +221,7 @@ type UserGroupTypeCountList {
 }
 
 type UserGroupUserMembershipType {
+  id: ID!
   userId: String!
   username: String!
   isActive: Boolean!
@@ -266,6 +270,7 @@ type UserStats {
 type UserType {
   userId: ID!
   username: String
+  id: ID!
   userInUserGroups(pagination: OffsetPaginationInput!): UserUserGroupMembershipTypeCountList!
 }
 
@@ -289,6 +294,7 @@ type UserUserGroupMembershipType {
   userGroupId: ID!
   userGroupName: String!
   membersCount: Int!
+  id: ID!
 }
 
 type UserUserGroupMembershipTypeCountList {