♿️Attach issues, pull request with url

Author: TheAlphamerc

lib/bloc/commit/index.dart

@@ -1,6 +1,4 @@
 export 'commit_bloc.dart';
 export 'commit_event.dart';
 export 'commit_model.dart';
-export 'commit_page.dart';
-export 'commit_screen.dart';
 export 'commit_state.dart';

lib/bloc/issues/issues_model.dart

@@ -87,6 +87,7 @@ class Issues {
 }
 
 class IssuesModel {
+  String url;
   String title;
   String createdAt;
   String state;
@@ -102,6 +103,7 @@ class IssuesModel {
   IssuesModel(
       {this.title,
       this.createdAt,
+      this.url,
       this.state,
       this.number,
       this.viewerDidAuthor,
@@ -114,6 +116,7 @@ class IssuesModel {
       this.type});
 
   IssuesModel.fromJson(Map<String, dynamic> json) {
+    url= json['url'];
     title = json['title'];
     createdAt = json['createdAt'];
     state = json['state'];
@@ -134,6 +137,7 @@ class IssuesModel {
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['url'] = this.url;
     data['title'] = this.title;
     data['createdAt'] = this.createdAt;
     data['state'] = this.state;

lib/bloc/notification/notification_event.dart

@@ -31,7 +31,7 @@ class OnLoad extends NotificationEvent {
       }
       yield LoadingNotificationState();
       final list = await _userRepository.getNotificationsList(pageNo: 1);
-      yield LoadedNotificationState(list: null, pageNo: 2, hasNextPage: list.length == 10);
+      yield LoadedNotificationState(list: list, pageNo: 2, hasNextPage: list.length == 10);
     } catch (_, stackTrace) {
       developer.log('$_',
           name: 'Load Repository Event', error: _, stackTrace: stackTrace);

lib/bloc/notification/notification_state.dart

@@ -23,6 +23,8 @@ class LoadedNotificationState extends NotificationState {
     currentList.addAll(notificationList);
     return LoadedNotificationState(list: currentList,pageNo: pageNo,hasNextPage: hasNextPage);
   }
+
+  bool get isNotNullEmpty => this.list != null && this.list.isNotEmpty;
 }
 
 class ErrorNotificationState extends NotificationState {

lib/bloc/search/model/search_userModel.dart

@@ -2,6 +2,7 @@ import 'package:flutter_github_connect/bloc/User/User_model.dart';
 import 'package:flutter_github_connect/bloc/issues/issues_model.dart';
 import 'package:flutter_github_connect/bloc/search/repo_model.dart';
 import 'package:flutter_github_connect/model/page_info_model.dart';
+import 'package:flutter_github_connect/model/pul_request.dart' as pull;
 
 class SearchModel {
   Data data;
@@ -66,6 +67,9 @@ class Search {
            case GithubSearchType.Issue:
             list.add(IssuesModel.fromJson(v));
             break;
+           case GithubSearchType.PullRequest:
+            list.add(pull.Node.fromJson(v));
+            break;
           default:
             list.add(SearchRepo.fromJson(v));
             break;

lib/bloc/search/repo_model.dart

@@ -537,7 +537,7 @@ extension TypeOfSearch on GithubSearchType {
   String asString() => {
         GithubSearchType.Issue: "ISSUE",
         GithubSearchType.ORganisation: "USER",
-        GithubSearchType.PullRequest: "USER",
+        GithubSearchType.PullRequest: "ISSUE",
         GithubSearchType.Repository : "REPOSITORY",
         GithubSearchType.People: "USER",
       }[this];

lib/bloc/search/search_state.dart

@@ -3,7 +3,7 @@ import 'package:flutter_github_connect/bloc/User/User_model.dart';
 import 'package:flutter_github_connect/bloc/issues/issues_model.dart';
 import 'package:flutter_github_connect/bloc/search/index.dart';
 import 'package:flutter_github_connect/bloc/search/model/search_userModel.dart';
-
+import 'package:flutter_github_connect/model/pul_request.dart' as pull;
 abstract class SearchState extends Equatable {
   @override
   List<Object> get props => ([]);
@@ -66,18 +66,18 @@ class LoadedSearchState extends SearchState {
   }
 
   // Todo : Need to implement
-  List<IssuesModel> toPullRequest() {
-    List<IssuesModel> userList = [];
+  pull.UserPullRequests toPullRequest() {
+    List<pull.Node> pullRequestsList = [];
     if (list != null) {
       list
         ..forEach((element) {
           if (element.type != "PullRequest") {
             return;
           }
-          userList.add(element);
+          pullRequestsList.add(element);
         });
     }
-    return userList;
+    return pull.UserPullRequests(nodes:pullRequestsList );
   }
 
   List<IssuesModel> toIssueList() {

lib/model/pul_request.dart

@@ -95,9 +95,11 @@ class Node {
     this.createdAt,
     this.deletions,
     this.files,
-    this.number
+    this.number,
+    this.url,
+    this.type
   });
-
+  final String url;
   final bool closed;
   final String title;
   final _Author author;
@@ -109,12 +111,16 @@ class Node {
   final int deletions;
   final _Files files;
   final int number;
+  /// Type is used for identify type of search pull request
+  final String type;
 
   factory Node.fromRawJson(String str) => Node.fromJson(json.decode(str));
 
   String toRawJson() => json.encode(toJson());
 
   factory Node.fromJson(Map<String, dynamic> json) => Node(
+        type: json["__typename"] == null ? null : json["__typename"],
+        url: json["url"] == null ? null : json["url"],
         closed: json["closed"] == null ? null : json["closed"],
         title: json["title"] == null ? null : json["title"],
         author:
@@ -136,6 +142,8 @@ class Node {
       );
 
   Map<String, dynamic> toJson() => {
+        "__typename": type == null ? null : type,
+        "url": url == null ? null : url,
         "closed": closed == null ? null : closed,
         "title": title == null ? null : title,
         "author": author == null ? null : author.toJson(),

lib/resources/grapgqlApi/graphql_query_api.dart

@@ -192,6 +192,7 @@ class Apis {
       #  }
         ... on Issue {
           __typename
+          url
           title
           number
           closed
@@ -239,12 +240,26 @@ class Apis {
         }
         ... on PullRequest {
           __typename
-          id
+         url
+          number
+          closed
+          title
           author {
             login
             avatarUrl
             url
           }
+          repository {
+            nameWithOwner
+          }
+          state
+          closedAt
+          createdAt
+          deletions
+          additions
+          files {
+            totalCount
+          }
         }
       }
     }

lib/resources/grapgqlApi/issues_api.dart

@@ -10,6 +10,7 @@ class IssuesApis {
           hasNextPage
         }
         nodes {
+          url
           title
           createdAt
           state
@@ -52,6 +53,7 @@ class IssuesApis {
             hasNextPage
           }
           nodes {
+            url
             title
             createdAt
             state