From 7b6c5928b7f06ad382d77c34e616c3077ed8bb34 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Thu, 27 Aug 2020 17:25:55 -0500 Subject: [PATCH] =?UTF-8?q?fix(directory):=20=F0=9F=90=9B=20ren=20License.?= =?UTF-8?q?Url=20in=20seed=20data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/directory/data/License.json | 76 +++++++++---------- .../Persistence/Queries/Entities/License.cs | 5 ++ 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/services/directory/data/License.json b/services/directory/data/License.json index 24af87fa9..4fedbed3f 100644 --- a/services/directory/data/License.json +++ b/services/directory/data/License.json @@ -1,13 +1,13 @@ [ { - "descriptionUrl": "https://creativecommons.org/licenses/by-nc-nd/4.0/", + "url": "https://creativecommons.org/licenses/by-nc-nd/4.0/", "id": 1, "name": "CC BY-NC-ND 4.0", "permissiveAdaptation": false, "permissiveCommercial": false }, { - "descriptionUrl": "https://opensource.org/licenses/MIT", + "url": "https://opensource.org/licenses/MIT", "id": 2, "name": "The MIT License", "permissiveAdaptation": true, @@ -20,21 +20,21 @@ "permissiveCommercial": false }, { - "descriptionUrl": "https://www.gnu.org/licenses/gpl-3.0.en.html", + "url": "https://www.gnu.org/licenses/gpl-3.0.en.html", "id": 4, "name": "GPLv3", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://en.wikipedia.org/wiki/All_rights_reserved", + "url": "https://en.wikipedia.org/wiki/All_rights_reserved", "id": 5, "name": "All Rights Reserved", "permissiveAdaptation": false, "permissiveCommercial": false }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-nc-sa/3.0/", + "url": "https://creativecommons.org/licenses/by-nc-sa/3.0/", "id": 6, "name": "CC BY-NC-SA 3.0", "permissiveAdaptation": true, @@ -47,84 +47,84 @@ "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-sa/4.0/", + "url": "https://creativecommons.org/licenses/by-sa/4.0/", "id": 8, "name": "CC BY-SA 4.0", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-nc-sa/4.0/", + "url": "https://creativecommons.org/licenses/by-nc-sa/4.0/", "id": 9, "name": "CC BY-NC-SA 4.0", "permissiveAdaptation": true, "permissiveCommercial": false }, { - "descriptionUrl": "https://opensource.org/licenses/BSD-3-Clause", + "url": "https://opensource.org/licenses/BSD-3-Clause", "id": 10, "name": "BSD-3-Clause", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://unlicense.org/", + "url": "https://unlicense.org/", "id": 11, "name": "The Unlicense", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-sa/3.0/", + "url": "https://creativecommons.org/licenses/by-sa/3.0/", "id": 12, "name": "CC BY-SA 3.0", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-nc/4.0/", + "url": "https://creativecommons.org/licenses/by-nc/4.0/", "id": 13, "name": "CC BY-NC 4.0", "permissiveAdaptation": true, "permissiveCommercial": false }, { - "descriptionUrl": "http://www.wtfpl.net/", + "url": "http://www.wtfpl.net/", "id": 14, "name": "WTFPL", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-nd/4.0/", + "url": "https://creativecommons.org/licenses/by-nd/4.0/", "id": 15, "name": "CC BY-ND 4.0", "permissiveAdaptation": false, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by/3.0/", + "url": "https://creativecommons.org/licenses/by/3.0/", "id": 16, "name": "CC BY 3.0", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://opensource.org/licenses/ISC", + "url": "https://opensource.org/licenses/ISC", "id": 17, "name": "ISC", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://www.apache.org/licenses/LICENSE-2.0", + "url": "https://www.apache.org/licenses/LICENSE-2.0", "id": 18, "name": "Apache 2.0", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html", + "url": "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html", "id": 19, "name": "GPLv2", "permissiveAdaptation": true, @@ -137,77 +137,77 @@ "permissiveCommercial": true }, { - "descriptionUrl": "https://osint.bambenekconsulting.com/license.txt", + "url": "https://osint.bambenekconsulting.com/license.txt", "id": 21, "name": "OSINT", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://raw.githubusercontent.com/googlehosts/hosts/master/LICENSE", + "url": "https://raw.githubusercontent.com/googlehosts/hosts/master/LICENSE", "id": 22, "name": "GoogleHosts", "permissiveAdaptation": false, "permissiveCommercial": false }, { - "descriptionUrl": "https://dbad-license.org/", + "url": "https://dbad-license.org/", "id": 23, "name": "\"Don't Be A Dick\" Public License", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by/4.0/", + "url": "https://creativecommons.org/licenses/by/4.0/", "id": 24, "name": "CC BY 4.0", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-nc-sa/2.5/", + "url": "https://creativecommons.org/licenses/by-nc-sa/2.5/", "id": 25, "name": "CC BY-NC-SA 2.5", "permissiveAdaptation": true, "permissiveCommercial": false }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-nc-nd/3.0/", + "url": "https://creativecommons.org/licenses/by-nc-nd/3.0/", "id": 26, "name": "CC BY-NC-ND 3.0", "permissiveAdaptation": false, "permissiveCommercial": false }, { - "descriptionUrl": "https://opensource.org/licenses/BSD-2-Clause", + "url": "https://opensource.org/licenses/BSD-2-Clause", "id": 27, "name": "BSD-2-Clause", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/publicdomain/zero/1.0/", + "url": "https://creativecommons.org/publicdomain/zero/1.0/", "id": 28, "name": "CC0 1.0 Universal", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://spdx.org/licenses/Beerware.html", + "url": "https://spdx.org/licenses/Beerware.html", "id": 29, "name": "The Beer-Ware License", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-sa/2.1/jp/deed.en", + "url": "https://creativecommons.org/licenses/by-sa/2.1/jp/deed.en", "id": 30, "name": "CC BY-SA 2.1 JP", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-nc/3.0/", + "url": "https://creativecommons.org/licenses/by-nc/3.0/", "id": 31, "name": "CC BY-NC 3.0", "permissiveAdaptation": true, @@ -220,35 +220,35 @@ "permissiveCommercial": false }, { - "descriptionUrl": "https://www.mozilla.org/MPL/2.0/", + "url": "https://www.mozilla.org/MPL/2.0/", "id": 33, "name": "Mozilla Public License v2.0", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://www.gnu.org/licenses/lgpl-3.0.en.html", + "url": "https://www.gnu.org/licenses/lgpl-3.0.en.html", "id": 34, "name": "Lesser GPL v3", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://github.com/DandelionSprout/Dandelicence/blob/master/DandelicenceNewestVersion.md", + "url": "https://github.com/DandelionSprout/Dandelicence/blob/master/DandelicenceNewestVersion.md", "id": 35, "name": "Dandelicence", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://creativecommons.org/licenses/by-nd/3.0/", + "url": "https://creativecommons.org/licenses/by-nd/3.0/", "id": 36, "name": "CC BY-ND 3.0", "permissiveAdaptation": false, "permissiveCommercial": true }, { - "descriptionUrl": "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html", + "url": "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html", "id": 37, "name": "Lesser GPL v2.1", "permissiveAdaptation": true, @@ -267,35 +267,35 @@ "permissiveCommercial": true }, { - "descriptionUrl": "https://pgl.yoyo.org/license/", + "url": "https://pgl.yoyo.org/license/", "id": 40, "name": "McRae General Public License", "permissiveAdaptation": true, "permissiveCommercial": false }, { - "descriptionUrl": "https://directory.fsf.org/wiki/License:AGPL-1.0", + "url": "https://directory.fsf.org/wiki/License:AGPL-1.0", "id": 41, "name": "AGPLv1", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://www.vicidial.com/?page_id=260", + "url": "https://www.vicidial.com/?page_id=260", "id": 42, "name": "AGPLv2", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://www.gnu.org/licenses/agpl-3.0.html", + "url": "https://www.gnu.org/licenses/agpl-3.0.html", "id": 43, "name": "AGPLv3", "permissiveAdaptation": true, "permissiveCommercial": true }, { - "descriptionUrl": "https://opensource.org/licenses/CPAL-1.0", + "url": "https://opensource.org/licenses/CPAL-1.0", "id": 44, "name": "CPAL-1.0", "permissiveAdaptation": true, diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs index 54f8f0858..aeb46b29b 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs @@ -9,9 +9,14 @@ public class License { public int Id { get; set; } public string Name { get; set; } = null!; + + // TODO: add to seed data public string? GitHubKey { get; set; } + public Uri? Url { get; set; } public IReadOnlyCollection FilterLists { get; private set; } = new HashSet(); + + // TODO: rm or capture permissiveX from seed data } internal class LicenseTypeConfiguration : IEntityTypeConfiguration