Deduplicate contributors configuration (#3399)

* merge script for review

* updated config files

* backwards compatibility in project scripts

* more script adjustments

* changed the key

* final newlines

* some fixes

* new config processed in sequence

* fix

* fix

* variable fix

* restored original format

* review feedback

* json array newline fix

* fix unknown mess

Author: max-ostapenko

src/config/2019.json

@@ -19,6 +19,7 @@
 
 config_json = {}
 timestamps_json = {}
+contributors = {}
 
 
 def get_config(year):
@@ -72,6 +73,7 @@ def update_config():
     global SUPPORTED_LANGUAGES
     global config_json
     global timestamps_json
+    global contributors
 
     config_files = []
 
@@ -81,6 +83,10 @@ def update_config():
                 config_filename = "config/%s" % file
                 with open(config_filename, "r") as config_file:
                     timestamps_json = json.load(config_file)
+            elif file == "contributors.json":
+                config_filename = "config/%s" % file
+                with open(config_filename, "r") as config_file:
+                    contributors = json.load(config_file)
             elif ".json" in file:
                 config_files.append(file[0:4])
 
@@ -95,6 +101,14 @@ def update_config():
                 SUPPORTED_LANGUAGES.update({year: get_languages(json_config)})
                 SUPPORTED_CHAPTERS.update({year: set(get_chapters(json_config))})
 
+                # Add the contributors details that contributed to this year
+                # for ease of look up later
+                json_config["contributors"] = {}
+                for contributor_id, contributor in contributors.items():
+                    if (year in contributor["teams"]):
+                        json_config["contributors"][contributor_id] = {**contributor}
+                        json_config["contributors"][contributor_id]["teams"] = contributor["teams"][year]
+
                 for contributor_id, contributor in json_config["contributors"].items():
                     if "avatar_url" not in contributor:
                         contributor["avatar_url"] = (

src/config/2020.json

@@ -1,5 +1,5 @@
 /**
-  * Show the contributors should be added in `config/year.json` file and which should remove based on their contributions in a perticular team
+  * Show the contributors should be added in `config/contributors.json` file and which should remove based on their contributions in a perticular team
   *
   * @param {object} configs all config file generate with get_yearly_configs().
   * @param {object}  chapter_contributors parsed contributors for each year (author, analyst, reviewer, editor)[Must be a Set (finding is more efficient)]
@@ -27,7 +27,7 @@ const get_contributors_difference = async (configs, chapter_contributors) => {
     const config_contributors = configs[year].contributors;
     const year_chapter_contributors = chapter_contributors[year];
 
-    // Generates contributors who are in config/year.json file but not contributed for a team
+    // Generates contributors who are in config/contributors.json file but not contributed for a team
     for (let contributor in config_contributors) {
       const contributor_teams = config_contributors[contributor].teams;
       if (contributor_teams.includes("analysts")) {
@@ -55,7 +55,7 @@ const get_contributors_difference = async (configs, chapter_contributors) => {
       }
     }
 
-    // Generates contributes who contributed in team but not in config/year.json file
+    // Generates contributes who contributed in team but not in config/contributors.json file
     const year_chapter_authors = year_chapter_contributors.authors;
     const year_chapter_reviewers = year_chapter_contributors.reviewers;
     const year_chapter_analysts = year_chapter_contributors.analysts;
@@ -94,7 +94,7 @@ const get_contributors_difference = async (configs, chapter_contributors) => {
 
     if (not_contributed_analysts.size > 0 || not_contributed_authors.size > 0 || not_contributed_reviewers.size > 0 || contributed_analysts.size > 0 || contributed_authors.size > 0 || contributed_reviewers.size > 0 || contributed_editors.size > 0) {
       console.log("\n****************************************************");
-      console.log(`Contributor Discrepancies in config/${year}.json`);
+      console.log(`Contributor Discrepancies in config/contributors.json for ${year}`);
       if (not_contributed_authors.size > 0 || contributed_authors.size > 0) {
         console.log("\tAuthors");
         if (not_contributed_authors.size > 0) {

src/config/2021.json

@@ -79,6 +79,21 @@ const find_config_files = async () => {
   return await recursive('config', [filter]);
 };
 
+function get_yearly_contributors(year) {
+  const contributorsData = JSON.parse(fs.readFileSync('config/contributors.json', 'utf8'));
+  const yearlyContributors = {};
+
+  for (const contributorKey in contributorsData) {
+    const yearContributions = contributorsData[contributorKey].teams[year];
+    if (typeof yearContributions == "object") {
+      yearlyContributors[contributorKey] = { ...contributorsData[contributorKey] }
+      yearlyContributors[contributorKey].teams = yearContributions;
+    }
+  }
+
+  return yearlyContributors;
+}
+
 const get_yearly_configs = async () => {
 
   let configs = {};
@@ -90,6 +105,9 @@ const get_yearly_configs = async () => {
     const [path,year] = config_file.match(re);
 
     configs[year] = JSON.parse(await fs.readFile(`config/${year}.json`, 'utf8'));
+
+    configs[year]["contributors"] = get_yearly_contributors(year);
+
   }
   return configs;
 };