Merge pull request #444 from json-schema-org/benjagm-update-issue-collector

Update ocwm-issue-collector to add support for github discussions

Author: benjagm

.github/workflows/ocwm-issue-collector.yml

@@ -17,7 +17,7 @@ jobs:
       with:
         node-version: '18'
     - name: Install dependencies
-      run: npm install @octokit/core 
+      run: npm install @octokit/core
     - name: Adding Issues
       uses: actions/github-script@v6
       env:
@@ -30,23 +30,25 @@ jobs:
         MY_TOKEN: ${{ secrets.AUTH_TOKEN }}
       with:
         script: |
-
           const octokit = require('@octokit/core').Octokit  
           const mygithub = new octokit({
             request: { fetch: fetch,},
             auth: process.env.MY_TOKEN
           });
-          
+
           const repoNames = process.env.REPO_NAMES;
           const placeholder = process.env.PLACEHOLDER;
           console.log("Placeholder:" + placeholder);
 
+          const octokit = require('@octokit/core').Octokit  
+          const mygithub = new octokit({ auth: process.env.MY_TOKEN })
+
           let repositories = repoNames.split(",")
           let targetLabel = encodeURIComponent(process.env.OCWM_LABEL);
           let appendLabel = encodeURIComponent(process.env.AGENDA_LABEL);
 
           console.log("Repositories:" + repositories);
-
+          
           console.log(`GET /repos/${process.env.OWNER}/${process.env.REPO}/issues?labels=${targetLabel}&per_page=1`);
 
           const { data: workMeetings } = await mygithub.request(`GET /repos/${process.env.OWNER}/${process.env.REPO}/issues?labels=${targetLabel}&per_page=1`, {
@@ -56,37 +58,66 @@ jobs:
 
           for (let r = 0; r < repositories.length; r++) {
             console.log(`GET /repos/${process.env.OWNER}/${repositories[r]}/issues?labels=${appendLabel}`);
-
             const { data: items2add } = await mygithub.request(`GET /repos/${process.env.OWNER}/${repositories[r]}/issues?labels=${appendLabel}`, {
             });
+            console.log("Issues to add:" + JSON.stringify(items2add));
 
-            console.log("Items to add:" + JSON.stringify(items2add));
 
-            let body = workMeetings[0].body;
-            let changesFlag = false;
-            for (let i = 0; i < items2add.length; i++) {
-                let url = items2add[i].html_url;
-                let author = "@" + items2add[i].user.login;
-                let title = items2add[i].title;
-                let search = parseInt(JSON.stringify(body).search(url));
-                if (search === -1) {
+            const { data: discussions } = await mygithub.request(`GET /repos/${process.env.OWNER}/${repositories[r]}/discussions?labels=${appendLabel}`, {
+            });
+            console.log("Discussions to add:" + JSON.stringify(discussions));
+
+            try {
+                let body = workMeetings[0].body;
+                let changesFlag = false;
+
+                // Loop through issues to add them to the agenda
+                for (let i = 0; i < items2add.length; i++) {
+                    let url = items2add[i].html_url;
+                    let author = "@" + items2add[i].user.login;
+                    let title = items2add[i].title;
+                    let search = parseInt(JSON.stringify(body).search(url));
+                    if (search === -1) {
+                        let startIndex = parseInt(JSON.stringify(body.indexOf(placeholder)))
+                        let json_text = JSON.stringify(body.substring(0, startIndex - 1) + `\n| ${url} - ${title} | ${author} |\r\n` + body.substring(startIndex, body.length));
+                        body = JSON.parse(json_text);
+                        changesFlag = true;
+                    }
+                }
+
+                // Loop through discussions to add them to the agenda
+                for (let i = 0; i < discussions.length; i++) {
+                  let url = discussions[i].html_url;
+                  let author = "@" + discussions[i].user.login;
+                  let title = discussions[i].title;
+                  let search = parseInt(JSON.stringify(body).search(url));
+                  if (search === -1) {
                     let startIndex = parseInt(JSON.stringify(body.indexOf(placeholder)))
                     let json_text = JSON.stringify(body.substring(0, startIndex - 1) + `\n| ${url} - ${title} | ${author} |\r\n` + body.substring(startIndex, body.length));
                     body = JSON.parse(json_text);
                     changesFlag = true;
+                  }
+                }
+
+                if (changesFlag){
+                  let template = JSON.stringify(JSON.stringify(body));
+                  let parsed = JSON.parse(JSON.parse(template));
+
+                  console.log(`PATCH /repos/${process.env.OWNER}/${process.env.REPO}/issues/${workMeetings[0].number}`);
+
+                  await mygithub.request(`PATCH /repos/${process.env.OWNER}/${process.env.REPO}/issues/${workMeetings[0].number}`, {
+                      body: parsed,
+                      milestone: null,
+                      state: 'open',
+                  })
                 }
             }
 
-            if (changesFlag){
-              let template = JSON.stringify(JSON.stringify(body));
-              let parsed = JSON.parse(JSON.parse(template));
 
-              console.log(`PATCH /repos/${process.env.OWNER}/${process.env.REPO}/issues/${workMeetings[0].number}`);
 
-              await mygithub.request(`PATCH /repos/${process.env.OWNER}/${process.env.REPO}/issues/${workMeetings[0].number}`, {
-                  body: parsed,
-                  milestone: null,
-                  state: 'open',
-              })
+            catch (err) {
+                console.error("Error:"+err.message);
+                console.log("There is no OCWM available");
             }
-          } 
+
+          }