Merge branch 'documentation' synch giltLab and gitHub

README.md

@@ -41,4 +41,4 @@ The crawler will just update the data, starting with the oldest timestamp.
 
 ## Database Stucture
 
-![System Diagram](/assets/images/DBStructure.png)
+![System Diagram](/assets/images/DBStructure.png)

frontend/src/app/repositories-ranking/repositories-ranking.component.ts

@@ -21,7 +21,7 @@ export class RepositoriesRankingComponent implements OnInit {
     ['logo', '', false, 'img'],
     ['institution', 'Institution', false, 'string'],
     ['organization', 'GitHub Organization', false, 'string'],
-    // ['last_years_commits', 'Commits last year', false, 'number'],
+    ['last_years_commits', 'Commits last year', false, 'number'],
     ['comments', 'Comments', false, 'number'],
     ['issues_all', 'Issues', false, 'number'],
     ['pull_requests_all', 'Pull requests', false, 'number'],

frontend/src/app/types.ts

@@ -125,6 +125,7 @@ export type User = {
   location: string;
   created_at: string;
   updated_at: string;
+  contributions_sum: number;
   public_repos: number;
   public_gists: number;
   followers: number;

oss-api/src/data/data.service.ts

@@ -95,7 +95,7 @@ export class DataService {
 
   private async handleRepositories(repositoryFileNames: string[]) {
     log('Handling all repositories');
-    let repositories: RepoData[] = [];
+    const repositories: RepoData[] = [];
     for (const repofileName of repositoryFileNames) {
       log(repofileName);
       const repoData: string = this.readFile(
@@ -227,6 +227,7 @@ export class DataService {
       company: contributorData.company,
       email: contributorData.email,
       twitter_username: contributorData.twitter_username,
+      contributions_sum: contributorData.contributions_sum,
       location: contributorData.location,
       created_at: new Date(contributorData.created_at),
       updated_at: new Date(contributorData.updated_at),

oss-api/src/interfaces.ts

@@ -30,6 +30,7 @@ export interface GithubUser {
   hireable: boolean;
   bio: string;
   twitter_username: string;
+  contributions_sum: number;
   public_repos: number;
   public_gists: number;
   followers: number;
@@ -1632,6 +1633,7 @@ export interface GithubOrganisation {
   is_verified: true;
   has_organization_projects: true;
   has_repository_projects: true;
+  contributions_sum: number;
   public_repos: number;
   public_gists: number;
   followers: number;
@@ -1900,6 +1902,7 @@ export interface Contributor {
   location: string;
   created_at: Date;
   updated_at: Date;
+  contributions_sum: number;
   public_repos: number;
   public_gists: number;
   followers: number;
@@ -1950,6 +1953,7 @@ export interface User {
   company: string;
   email: string | null;
   twitter_username: string | null;
+  contributions_sum: number | null;
   location: string;
   created_at: Date;
   updated_at: Date;
@@ -2264,6 +2268,7 @@ export type UserSummary = {
   company: string;
   email: string;
   twitter_username: string;
+  contributions_sum: number;
   location: string;
   created_at: string;
   updated_at: string;

oss-api/src/mongo-db/mongo-db.service.ts

@@ -477,6 +477,7 @@ export class MongoDbService implements OnApplicationShutdown, OnModuleInit {
             company: 1,
             location: 1,
             twitter_username: 1,
+            contrubutions_sum: 1,
             public_repos: 1,
             public_gists: 1,
             followers: 1,

oss-api/src/transformer/transformer.service.ts

@@ -74,6 +74,7 @@ export class TransformerService {
       company: user.company,
       email: user.email,
       twitter_username: user.twitter_username,
+      contributions_sum: user.contributions_sum,
       location: user.location,
       created_at: user.created_at,
       updated_at: user.updated_at,