@opentermsarchive/engine 4.0.0 → 4.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentermsarchive/engine",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Tracks and makes visible changes to the terms of online services",
   "homepage": "https://opentermsarchive.org",
   "bugs": {

package/src/collection-api/routes/metadata.js

@@ -58,6 +58,10 @@ const PACKAGE_JSON_PATH = '../../../package.json';
  *           type: string
  *           format: uri
  *           description: URL to the snapshots repository
+ *         donations:
+ *           type: string
+ *           format: uri
+ *           description: URL to the donations page
  *         logo:
  *           type: string
  *           format: uri
@@ -94,41 +98,23 @@ const PACKAGE_JSON_PATH = '../../../package.json';
  *                 description: The date when tracking ended for this period
  *         governance:
  *           type: object
- *           properties:
- *             hosts:
- *               type: array
- *               items:
- *                 $ref: '#/components/schemas/Organization'
- *             administrators:
- *               type: array
- *               items:
- *                 $ref: '#/components/schemas/Organization'
- *             curators:
- *               type: array
- *               items:
- *                 $ref: '#/components/schemas/Organization'
- *             maintainers:
- *               type: array
- *               items:
- *                 $ref: '#/components/schemas/Organization'
- *             sponsors:
- *               type: array
- *               items:
- *                 $ref: '#/components/schemas/Organization'
- *     Organization:
- *       type: object
- *       properties:
- *         name:
- *           type: string
- *           description: Name of the organization
- *         url:
- *           type: string
- *           format: uri
- *           description: URL to the organization's website
- *         logo:
- *           type: string
- *           format: uri
- *           description: URL to the organization's logo
+ *           additionalProperties:
+ *             type: object
+ *             properties:
+ *               url:
+ *                 type: string
+ *                 format: uri
+ *                 description: URL to the entity's website
+ *               logo:
+ *                 type: string
+ *                 format: uri
+ *                 description: URL to the entity's logo
+ *               roles:
+ *                 type: array
+ *                 items:
+ *                   type: string
+ *                   enum: [host, administrator, curator, maintainer, sponsor]
+ *                   description: Roles of the entity within the governance
  */
 export default async function metadataRouter(collectionPath, services) {
   const router = express.Router();

package/src/reporter/gitlab/index.js

@@ -249,10 +249,9 @@ export default class GitLab {
 
   async getIssue({ title, ...searchParams }) {
     try {
-      let apiUrl = `${this.apiBaseURL}/projects/${this.projectId}/issues?state=${searchParams.state}&per_page=100`;
+      let apiUrl = `${this.apiBaseURL}/projects/${this.projectId}/issues?search=${encodeURIComponent(title)}&state=${searchParams.state}&per_page=100`;
 
-      if (searchParams.state == 'all') apiUrl = `${this.apiBaseURL}/projects/${this.projectId}/issues?per_page=100`;
-      apiUrl = `${this.apiBaseURL}/projects/${this.projectId}/issues?search=${encodeURIComponent(title)}&per_page=100`;
+      if (searchParams.state == 'all') apiUrl = `${this.apiBaseURL}/projects/${this.projectId}/issues?search=${encodeURIComponent(title)}&per_page=100`;
 
       const options = GitLab.baseOptionsHttpReq();
 

package/src/reporter/gitlab/index.test.js

@@ -212,7 +212,33 @@ describe('GitLab', function () {
         .get(`/projects/${PROJECT_ID}/issues?search=${encodeURIComponent(ISSUE.title)}&per_page=100`)
         .reply(200, [ ISSUE, ANOTHER_ISSUE ]);
 
-      result = await gitlab.getIssue({ title: ISSUE.title });
+      result = await gitlab.getIssue({ title: ISSUE.title, state: GitLab.ISSUE_STATE_ALL });
+    });
+
+    after(nock.cleanAll);
+
+    it('searches for the issue', () => {
+      expect(scope.isDone()).to.be.true;
+    });
+
+    it('returns the expected issue', () => {
+      expect(result).to.deep.equal(ISSUE);
+    });
+  });
+
+  describe('#getIssueWithStatus', () => {
+    let scope;
+    let result;
+
+    const ISSUE = { number: 123, title: 'Test Issue', state: 'opened' };
+    const ANOTHER_ISSUE = { number: 124, title: 'Test Issue 2', state: 'opened' };
+
+    before(async () => {
+      scope = nock(gitlab.apiBaseURL)
+        .get(`/projects/${PROJECT_ID}/issues?search=${encodeURIComponent(ISSUE.title)}&state=${GitLab.ISSUE_STATE_OPEN}&per_page=100`)
+        .reply(200, [ ISSUE, ANOTHER_ISSUE ]);
+
+      result = await gitlab.getIssue({ title: ISSUE.title, state: GitLab.ISSUE_STATE_OPEN });
     });
 
     after(nock.cleanAll);
@@ -265,7 +291,7 @@ describe('GitLab', function () {
 
       before(async () => {
         nock(gitlab.apiBaseURL)
-          .get(`/projects/${PROJECT_ID}/issues?search=${encodeURIComponent(ISSUE.title)}&per_page=100`)
+          .get(`/projects/${PROJECT_ID}/issues?search=${encodeURIComponent(ISSUE.title)}&state=${GitLab.ISSUE_STATE_OPEN}&per_page=100`)
           .reply(200, [ISSUE]);
 
         addCommentScope = nock(gitlab.apiBaseURL)