Skip to content

Commit

Permalink
fix(rest): Added new endpoint for LicenseType in admin tab
Browse files Browse the repository at this point in the history 
Signed-off-by: Nikesh kumar <kumar.nikesh@simens.com>
  • Loading branch information
Nikesh kumar committed Oct 30, 2023
1 parent 87295de commit 7aacb90
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 6 deletions.
12 changes: 12 additions & 0 deletions rest/resource-server/src/docs/asciidoc/licenses.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,15 @@ include::{snippets}/should_document_import_osadl_info/curl-request.adoc[]

===== Example response
include::{snippets}/should_document_import_osadl_info/http-response.adoc[]

[[add-license-type]]
==== Create license type

A `POST` request help to create license type.

===== Example request
include::{snippets}/should_document_get_create_license_type/curl-request.adoc[]

===== Example response
include::{snippets}/should_document_get_create_license_type/http-response.adoc[]

11 changes: 10 additions & 1 deletion ...server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/LicenseController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.eclipse.sw360.datahandler.thrift.RequestStatus;
import org.eclipse.sw360.datahandler.thrift.RequestSummary;
import org.eclipse.sw360.datahandler.thrift.licenses.License;
import org.eclipse.sw360.datahandler.thrift.licenses.LicenseType;
import org.eclipse.sw360.datahandler.thrift.licenses.Obligation;
import org.eclipse.sw360.datahandler.thrift.users.User;
import org.eclipse.sw360.rest.resourceserver.core.HalResource;
Expand Down Expand Up @@ -206,7 +207,7 @@ public ResponseEntity<?> uploadLicenses(@RequestParam("licenseFile") MultipartFi
}
return ResponseEntity.ok(Series.SUCCESSFUL);
}

@RequestMapping(value = LICENSES_URL + "/import/OSADL", method = RequestMethod.POST)
public ResponseEntity<RequestSummary> importOsadlInfo() throws TException {
User sw360User = restControllerHelper.getSw360UserFromAuthentication();
Expand All @@ -217,4 +218,12 @@ public ResponseEntity<RequestSummary> importOsadlInfo() throws TException {
HttpStatus status = HttpStatus.OK;
return new ResponseEntity<>(requestSummary,status);
}

@RequestMapping(value = LICENSES_URL + "/addLicenseType", method = RequestMethod.POST)
public ResponseEntity<RequestStatus> createLicenseType(@RequestParam(value = "licenseType", required = true) String licenseType, HttpServletRequest request) throws TException {
User sw360User = restControllerHelper.getSw360UserFromAuthentication();
RequestStatus requestStatus=licenseService.addLicenseType(sw360User, licenseType, request);
HttpStatus status = HttpStatus.OK;
return new ResponseEntity<>(requestStatus,status);
}
}
36 changes: 32 additions & 4 deletions ...rver/src/main/java/org/eclipse/sw360/rest/resourceserver/license/Sw360LicenseService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@

package org.eclipse.sw360.rest.resourceserver.license;

import lombok.NonNull;
import lombok.RequiredArgsConstructor;

import org.apache.commons.lang.StringUtils;
import org.apache.poi.util.StringUtil;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TCompactProtocol;
import org.apache.thrift.protocol.TProtocol;
Expand All @@ -25,6 +29,7 @@
import org.eclipse.sw360.datahandler.thrift.licenses.License;
import org.eclipse.sw360.datahandler.thrift.licenses.Obligation;
import org.eclipse.sw360.datahandler.thrift.licenses.LicenseService;
import org.eclipse.sw360.datahandler.thrift.licenses.LicenseType;
import org.eclipse.sw360.datahandler.thrift.users.User;
import org.eclipse.sw360.datahandler.thrift.users.UserGroup;
import org.eclipse.sw360.exporter.LicsExporter;
Expand All @@ -34,6 +39,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
import org.springframework.http.HttpRequest;
import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.stereotype.Service;
import org.springframework.util.FileCopyUtils;
Expand All @@ -60,6 +66,7 @@ public class Sw360LicenseService {
@Value("${sw360.thrift-server-url:http://localhost:8080}")
private String thriftServerUrl;
private static String CONTENT_TYPE = "application/zip";
LicenseType lType = new LicenseType();

public List<License> getLicenses() throws TException {
LicenseService.Iface sw360LicenseClient = getThriftLicenseClient();
Expand Down Expand Up @@ -213,11 +220,11 @@ private void copyDataStreamToResponse(HttpServletResponse response, ByteArrayInp
}

public void uploadLicense(User sw360User, MultipartFile file, boolean overwriteIfExternalIdMatches, boolean overwriteIfIdMatchesEvenWithoutExternalIdMatch) throws IOException, TException {
final HashMap<String, InputStream> inputMap = new HashMap<>();
final HashMap<String, InputStream> inputMap = new HashMap<>();

if (!PermissionUtils.isUserAtLeast(UserGroup.ADMIN, sw360User)) {
throw new HttpMessageNotReadableException("Unable to upload license file. User is not admin");
}
if (!PermissionUtils.isUserAtLeast(UserGroup.ADMIN, sw360User)) {
throw new HttpMessageNotReadableException("Unable to upload license file. User is not admin");
}
try {
InputStream inputStream = file.getInputStream();
ZipTools.extractZipToInputStreamMap(inputStream, inputMap);
Expand All @@ -231,6 +238,7 @@ public void uploadLicense(User sw360User, MultipartFile file, boolean overwriteI
}
}
}

public RequestSummary importOsadlInformation(User sw360User) throws TException {
LicenseService.Iface sw360LicenseClient = getThriftLicenseClient();
if (PermissionUtils.isUserAtLeast(UserGroup.ADMIN, sw360User)) {
Expand All @@ -240,4 +248,24 @@ public RequestSummary importOsadlInformation(User sw360User) throws TException {
throw new HttpMessageNotReadableException("Unable to import All Spdx license. User is not admin");
}
}

public RequestStatus addLicenseType(User sw360User, String licenseType, HttpServletRequest request) throws TException {
LicenseService.Iface sw360LicenseClient = getThriftLicenseClient();
if (StringUtils.isNotEmpty(licenseType)) {
lType.setLicenseType(licenseType);
}
else {
throw new HttpMessageNotReadableException("license type is empty");
}
try {
if (PermissionUtils.isUserAtLeast(UserGroup.ADMIN, sw360User)) {
RequestStatus status = sw360LicenseClient.addLicenseType(lType, sw360User);
} else {
throw new HttpMessageNotReadableException("Unable to create License Type. User is not admin");
}
} catch ( Exception e) {
throw new TException(e.getMessage());
}
return RequestStatus.SUCCESS;
}
}
20 changes: 19 additions & 1 deletion ...-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/LicenseSpecTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import org.apache.thrift.TException;
import org.eclipse.sw360.datahandler.thrift.licenses.License;
import org.eclipse.sw360.datahandler.thrift.licenses.LicenseType;
import org.eclipse.sw360.rest.resourceserver.TestHelper;
import org.eclipse.sw360.rest.resourceserver.license.Sw360LicenseService;
import org.eclipse.sw360.datahandler.thrift.licenses.Obligation;
Expand Down Expand Up @@ -96,6 +97,11 @@ public void before() throws TException, IOException {
licenseList.add(license2);

requestSummary.setRequestStatus(RequestStatus.SUCCESS);
LicenseType licensetype = new LicenseType();
licensetype.setId("1234");
licensetype.setLicenseType("wer");
licensetype.setLicenseTypeId(123);
licensetype.setType("xyz");

given(this.licenseServiceMock.getLicenses()).willReturn(licenseList);
given(this.licenseServiceMock.getLicenseById(eq(license.getId()))).willReturn(license);
Expand All @@ -105,6 +111,7 @@ public void before() throws TException, IOException {
Mockito.doNothing().when(licenseServiceMock).getDownloadLicenseArchive(any(), any(), any());
Mockito.doNothing().when(licenseServiceMock).uploadLicense(any(), any(), anyBoolean(), anyBoolean());
given(this.licenseServiceMock.importOsadlInformation(any())).willReturn(requestSummary);
given(this.licenseServiceMock.addLicenseType(any(),any() , any())).willReturn(RequestStatus.SUCCESS);
obligation1 = new Obligation();
obligation1.setId("0001");
obligation1.setTitle("Obligation 1");
Expand Down Expand Up @@ -255,12 +262,23 @@ public void should_document_upload_license() throws Exception {
.header("Authorization", "Bearer " + accessToken);
this.mockMvc.perform(builder).andExpect(status().isOk());
}


@Test
public void should_document_import_osadl_info() throws Exception {
String accessToken = TestHelper.getAccessToken(mockMvc, testUserId, testUserPassword);
mockMvc.perform(post("/api/licenses/import/OSADL")
.header("Authorization", "Bearer " + accessToken)
.accept(MediaTypes.HAL_JSON))
.andExpect(status().isOk());
}

@Test
public void should_document_get_create_license_type() throws Exception {
String accessToken = TestHelper.getAccessToken(mockMvc, testUserId, testUserPassword);
mockMvc.perform(post("/api/licenses/" + "/addLicenseType")
.header("Authorization", "Bearer " + accessToken)
.param("licenseType", "wer")
.accept(MediaTypes.HAL_JSON))
.andExpect(status().isOk());
}
}

0 comments on commit 7aacb90

Please sign in to comment.