Skip to content

Commit 9608e5f

Browse files
GMishxGMishx
authored
Merge pull request #275 from Akashsah2003/chore/report/week_6-12
chore(report): SPDX Expression week 6-12
2 parents cc73f06 + 9fe910d commit 9608e5f

12 files changed

+502
-0
lines changed

‎docs/2024/spdx-expression/updates/2024-07-02.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
title: Week 6
3+
author: Akash Sah
4+
tags: [gsoc24, spdx-expression]
5+
---
6+
7+
<!--
8+
SPDX-License-Identifier: CC-BY-SA-4.0
9+
10+
SPDX-FileCopyrightText: 2024 Akash Sah <akashsah2003@gmail.com>
11+
-->
12+
13+
# Week 6 Meeting and Activities
14+
15+
_(July 2, 2024)_
16+
17+
## Attendees:
18+
19+
- [Akash Sah](https://github.com/Akashsah2003)
20+
- [Gaurav Mishra](https://github.com/GMishx)
21+
- [Shaheem Azmal M MD](https://github.com/shaheemazmalmmd)
22+
- [Dearsh Oberoi](https://github.com/deo002)
23+
- [Abhishek Kumar](https://github.com/abhi-kumar17871)
24+
25+
## Discussions
26+
27+
### RDF and Tag Value Reports
28+
29+
- Presented my work on RDF and tag value reports.
30+
- Discussed how to concatenate two license expressions that are main licenses.
31+
- There should be no duplicate license expressions in the `license_expression` table.
32+
- For user decisions, license expressions should be stored in the `clearing_event` table.
33+
- Validation of license expressions will be completed later when everything is finalized.
34+
35+
## Activities
36+
37+
- Worked on CycloneDX and DEP5 reports.
38+
39+
## Sample Reports
40+
41+
- [CycloneDX report Sample](/reports/CYCLONEDX_JSON_Test19.zip_2024-08-18_11_47_57.json)
42+
- [DEP5 report Sample](/reports/DEP5_Test19.zip_1723962090.txt)

‎docs/2024/spdx-expression/updates/2024-07-09.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
title: Week 7
3+
author: Akash Sah
4+
tags: [gsoc24, spdx-expression]
5+
---
6+
7+
<!--
8+
SPDX-License-Identifier: CC-BY-SA-4.0
9+
10+
SPDX-FileCopyrightText: 2024 Akash Sah <akashsah2003@gmail.com>
11+
-->
12+
13+
# Week 7 Meeting and Activities
14+
15+
_(July 9, 2024)_
16+
17+
## Attendees:
18+
19+
- [Akash Sah](https://github.com/Akashsah2003)
20+
- [Gaurav Mishra](https://github.com/GMishx)
21+
- [Shaheem Azmal M MD](https://github.com/shaheemazmalmmd)
22+
- [Dearsh Oberoi](https://github.com/deo002)
23+
- [Abhishek Kumar](https://github.com/abhi-kumar17871)
24+
25+
## Discussions
26+
27+
### CycloneDX and DEP5 Reports
28+
29+
- Presented my work on CycloneDX and DEP5 reports.
30+
- Identified other report formats that need changes: Unified Report, CLI XML.
31+
- Next steps include working on removing duplicate expressions and clearing part of expressions.
32+
33+
## Activities
34+
35+
- Modified OJO to prevent storing duplicate license expressions.
36+
- Began working on the clearing part of expressions.

‎docs/2024/spdx-expression/updates/2024-07-16.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
title: Week 8
3+
author: Akash Sah
4+
tags: [gsoc24, spdx-expression]
5+
---
6+
7+
<!--
8+
SPDX-License-Identifier: CC-BY-SA-4.0
9+
10+
SPDX-FileCopyrightText: 2024 Akash Sah <akashsah2003@gmail.com>
11+
-->
12+
13+
# Week 8 Meeting and Activities
14+
15+
_(July 16, 2024)_
16+
17+
## Attendees:
18+
19+
- [Akash Sah](https://github.com/Akashsah2003)
20+
- [Gaurav Mishra](https://github.com/GMishx)
21+
- [Shaheem Azmal M MD](https://github.com/shaheemazmalmmd)
22+
- [Dearsh Oberoi](https://github.com/deo002)
23+
- [Abhishek Kumar](https://github.com/abhi-kumar17871)
24+
25+
## Discussions
26+
27+
### Clearing Part of License Expression
28+
29+
- Presented my work on the clearing part of the license expression.
30+
- License expressions can now be cleared, and the cleared expressions are used for generating reports.
31+
- Edited license expressions appear in Clearing History as added and removed expressions.
32+
#### Clearing History
33+
![Clearing History](/img/spdx-expression/clearingHistory.png)
34+
- Will need to update the APIs related to licenses and clearing history in the future.
35+
36+
## Activities
37+
38+
- Developed a functionality where users can add license expressions for items that previously had no license expressions (User Decision License Expressions).

‎docs/2024/spdx-expression/updates/2024-07-23.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
title: Week 9
3+
author: Akash Sah
4+
tags: [gsoc24, spdx-expression]
5+
---
6+
7+
<!--
8+
SPDX-License-Identifier: CC-BY-SA-4.0
9+
10+
SPDX-FileCopyrightText: 2024 Akash Sah <akashsah2003@gmail.com>
11+
-->
12+
13+
# Week 9 Meeting and Activities
14+
15+
_(July 23, 2024)_
16+
17+
## Attendees:
18+
19+
- [Akash Sah](https://github.com/Akashsah2003)
20+
- [Gaurav Mishra](https://github.com/GMishx)
21+
- [Shaheem Azmal M MD](https://github.com/shaheemazmalmmd)
22+
- [Dearsh Oberoi](https://github.com/deo002)
23+
- [Abhishek Kumar](https://github.com/abhi-kumar17871)
24+
25+
## Discussions
26+
27+
### User Decision License Expressions
28+
29+
- Presented my work on User Decision License Expressions.
30+
- Acknowledgement should be added to license expressions.
31+
- Users should be able to add license expressions and main licenses, and multiple license expressions should be concatenated with the `AND` operator when generating the reports.
32+
- Remove dual license results from `nomo` and `ojo`.
33+
- Decision exporter and importer should be modified to include license expression results.
34+
35+
## Activities
36+
37+
- Corrected failing unit tests for PR #2771.

‎docs/2024/spdx-expression/updates/2024-07-30.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
title: Week 10
3+
author: Akash Sah
4+
tags: [gsoc24, spdx-expression]
5+
---
6+
7+
<!--
8+
SPDX-License-Identifier: CC-BY-SA-4.0
9+
10+
SPDX-FileCopyrightText: 2024 Akash Sah <akashsah2003@gmail.com>
11+
-->
12+
13+
# Week 10 Meeting and Activities
14+
15+
_(July 30, 2024)_
16+
17+
## Meeting
18+
19+
- I was unable to attend the meeting this week because I was traveling.
20+
21+
## Activities
22+
23+
- Added acknowledgments to license expressions.
24+
#### Acknowledgement for license expression
25+
![Acknowledgement for expression](/img/spdx-expression/acknowledgementExpression.png)
26+
- Removed dual license results from `nomo` and `ojo`.
27+
- Modified all the reports to inctegrate license expression as main licenses.
28+
29+
## Next Steps
30+
31+
- I will be working on correcting the Decision exporter and importer.

‎docs/2024/spdx-expression/updates/2024-08-06.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
title: Week 11
3+
author: Akash Sah
4+
tags: [gsoc24, spdx-expression]
5+
---
6+
7+
<!--
8+
SPDX-License-Identifier: CC-BY-SA-4.0
9+
10+
SPDX-FileCopyrightText: 2024 Akash Sah <akashsah2003@gmail.com>
11+
-->
12+
13+
# Week 11 Meeting and Activities
14+
15+
_(August 6, 2024)_
16+
17+
## Meeting
18+
19+
- The meeting was rescheduled as some members of the REST team and the SPDX team were unavailable.
20+
- The new meeting time has been set for every Friday from 11:00 to 11:30 UTC.
21+
22+
## Activities
23+
24+
- Worked on exporting and importing license decisions.
25+
26+
## Sample Reports
27+
28+
- [Decision Exporter](/reports/FOSSology_Decisions_Test19.zip_18_08_2024_12_58_22.json)
29+
30+
## Next Steps
31+
32+
- Will focus on developing APIs related to license expressions and clearing history.

‎docs/2024/spdx-expression/updates/2024-08-16.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
title: Week 12
3+
author: Akash Sah
4+
tags: [gsoc24, spdx-expression]
5+
---
6+
7+
<!--
8+
SPDX-License-Identifier: CC-BY-SA-4.0
9+
10+
SPDX-FileCopyrightText: 2024 Akash Sah <akashsah2003@gmail.com>
11+
-->
12+
13+
# Week 12 Meeting and Activities
14+
15+
_(August 16, 2024)_
16+
17+
## Attendees:
18+
19+
- [Akash Sah](https://github.com/Akashsah2003)
20+
- [Gaurav Mishra](https://github.com/GMishx)
21+
- [Shaheem Azmal M MD](https://github.com/shaheemazmalmmd)
22+
- [Dearsh Oberoi](https://github.com/deo002)
23+
- [Abhishek Kumar](https://github.com/abhi-kumar17871)
24+
25+
## Discussions
26+
27+
### API Work and Report Formats
28+
29+
- Presented my work on 6 APIs.
30+
- Discussed the need to modify the `POST` endpoint at `/uploads/{uploadId}/expression/main` to ensure only cleared license expressions for any item in an upload can be added as the main expression.
31+
- Received formats for CLI XML and unified reports, which will be updated accordingly.
32+
33+
## Activities
34+
35+
- Modified `Ojo` to prevent creating License Expressions for items with a single license.
36+
- Modified `GET /uploads/{uploadId}/licenses/main` to include an optional boolean query parameter `includeExpressions` for retrieving main licenses including expressions.
37+
- Modified `GET /uploads/{uploadId}/item/{itemId}/licenses` to include an optional boolean query parameter `includeExpressions` for retrieving license decisions including expressions for an item.
38+
- Modified `GET /uploads/{uploadId}/item/{itemId}/clearing-history` to include an optional boolean query parameter `includeExpressions` for retrieving the clearing history including expressions for an item.
39+
- Created `POST /uploads/{uploadId}/expression/main` to add license expressions as the main license for an upload.
40+
- Created `DELETE /uploads/{uploadId}/expression/main` to remove license expressions as the main license for an upload.
41+
- Created `PUT /uploads/{uploadId}/item/{itemId}/expression` to set license expression decisions for an item.

‎static/img/spdx-expression/acknowledgementExpression.png

56.4 KB
Loading

‎static/img/spdx-expression/clearingHistory.png

228 KB
Loading

0 commit comments

Comments
 (0)