Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(api): Merge a license into an existing one #2529

Merged
merged 1 commit into from
Sep 26, 2023

Conversation

dushimsam
Copy link
Contributor

@dushimsam dushimsam commented Jul 7, 2023

Description

Added the API to merge a given candidate license into another existing one.

Changes

  1. Added a new method in LicenseController to build the functionality.
  2. Updated the main file(index.php) by adding a new route PUT /license/merge/{shortname}.
  3. Updated the openapi.yaml file to write the new API's documentation.

How to test

Make a PUT request on the endpoint: /license/merge/{shortname},

Screenshots

image

image

Related Issue:

Fixes #2510

cc: @shaheemazmalmmd @GMishx

@GMishx GMishx added needs code review needs test GSOC-23 Label to tag pull request which are part of the GSOC 2023 labels Jul 7, 2023
@github-actions github-actions bot added the has merge conflicts PR to be rebased label Jul 26, 2023
@github-actions
Copy link

This pull request has conflicts, please rebase with master to resolve those before we can evaluate the pull request.

Copy link
Member

@GMishx GMishx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A minor change needed.

src/www/ui/api/index.php Outdated Show resolved Hide resolved
Copy link
Member

@GMishx GMishx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes looks good.

Copy link
Member

@GMishx GMishx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, working as expected.

@GMishx GMishx added ready has merge conflicts PR to be rebased and removed needs test labels Aug 28, 2023
@github-actions github-actions bot added has merge conflicts PR to be rebased and removed has merge conflicts PR to be rebased labels Aug 31, 2023
@github-actions
Copy link

github-actions bot commented Sep 5, 2023

This pull request has conflicts, please rebase with master to resolve those before we can evaluate the pull request.

Signed-off-by: dushimsam <dushsam@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
GSOC-23 Label to tag pull request which are part of the GSOC 2023 ready
Projects
None yet
Development

Successfully merging this pull request may close these issues.

License
2 participants