From 8d9ca9f26266eb016ed883e61baf33277c81286e Mon Sep 17 00:00:00 2001 From: Hyeonuook Kim Date: Wed, 9 Aug 2023 11:26:29 +0900 Subject: [PATCH] fix : rename variable name --- .../service/AwsBlueprintServiceImpl.java | 146 +++++++++--------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/src/main/java/com/kumofactory/cloud/blueprint/service/AwsBlueprintServiceImpl.java b/src/main/java/com/kumofactory/cloud/blueprint/service/AwsBlueprintServiceImpl.java index 6ea80a7..72bd6fb 100644 --- a/src/main/java/com/kumofactory/cloud/blueprint/service/AwsBlueprintServiceImpl.java +++ b/src/main/java/com/kumofactory/cloud/blueprint/service/AwsBlueprintServiceImpl.java @@ -59,18 +59,18 @@ public AwsBluePrintDto getAwsBlueprint(String uuid) { throw new RuntimeException("awsBluePrintById is null"); } - List awsAreas = awsAreaRepository.findAllByBluePrint(awsBluePrintById); - List awsComponents = awsComponentRepository.findAllByBluePrint(awsBluePrintById); - List componentLines = componentLineRepository.findAllByBluePrint(awsBluePrintById); - AwsBluePrintDto awsBluePrintDto = new AwsBluePrintDto(); - awsBluePrintDto.setName(awsBluePrintById.getName()); - awsBluePrintDto.setStatus(awsBluePrintById.getStatus()); - awsBluePrintDto.setUuid(awsBluePrintById.getUuid()); - awsBluePrintDto.setAreas(AwsBluePrintDto.awsAreaDtosMapper(awsAreas)); - awsBluePrintDto.setComponents(AwsBluePrintDto.awsComponentDtosMapper(awsComponents)); - awsBluePrintDto.setLinks(AwsBluePrintDto.componentLinkDtoListMapper(componentLines)); - return awsBluePrintDto; - } + List awsAreas = awsAreaRepository.findAllByBluePrint(awsBluePrintById); + List awsComponents = awsComponentRepository.findAllByBluePrint(awsBluePrintById); + List componentLines = componentLineRepository.findAllByBluePrint(awsBluePrintById); + AwsBluePrintDto awsBluePrintDto = new AwsBluePrintDto(); + awsBluePrintDto.setName(awsBluePrintById.getName()); + awsBluePrintDto.setStatus(awsBluePrintById.getStatus()); + awsBluePrintDto.setUuid(awsBluePrintById.getUuid()); + awsBluePrintDto.setAreas(AwsBluePrintDto.awsAreaDtosMapper(awsAreas)); + awsBluePrintDto.setComponents(AwsBluePrintDto.awsComponentDtosMapper(awsComponents)); + awsBluePrintDto.setLinks(AwsBluePrintDto.componentLinkDtoListMapper(componentLines)); + return awsBluePrintDto; + } @Override public List getMyAwsBlueprints(String oauthId) { @@ -79,20 +79,20 @@ public List getMyAwsBlueprints(String oauthId) { throw new RuntimeException("member is null"); } - List awsBluePrints = awsBluePrintRepository.findAwsBluePrintsByMember(member); - List awsBluePrintDtos = new ArrayList<>(); - for (AwsBluePrint awsBluePrint : awsBluePrints) { - AwsBluePrintListDto dto = new AwsBluePrintListDto(); - dto.setName(awsBluePrint.getName()); - dto.setUuid(awsBluePrint.getUuid()); - dto.setId(awsBluePrint.getId()); - dto.setCreatedAt(awsBluePrint.getCreated_at()); - dto.setStatus(awsBluePrint.getStatus()); - dto.setPresignedUrl(awsS3Helper.getPresignedUrl(awsBluePrint.getKeyName())); - awsBluePrintDtos.add(dto); - } - return awsBluePrintDtos; - } + List awsBluePrints = awsBluePrintRepository.findAwsBluePrintsByMember(member); + List awsBluePrintDtos = new ArrayList<>(); + for (AwsBluePrint awsBluePrint : awsBluePrints) { + AwsBluePrintListDto dto = new AwsBluePrintListDto(); + dto.setName(awsBluePrint.getName()); + dto.setUuid(awsBluePrint.getUuid()); + dto.setId(awsBluePrint.getId()); + dto.setCreatedAt(awsBluePrint.getCreated_at()); + dto.setStatus(awsBluePrint.getStatus()); + dto.setPresignedUrl(awsS3Helper.getPresignedUrl(awsBluePrint.getKeyName())); + awsBluePrintDtos.add(dto); + } + return awsBluePrintDtos; + } @Override public void store(AwsBluePrintDto awsBluePrintDto, String provision, String userId) throws JsonProcessingException { @@ -129,53 +129,53 @@ public boolean delete(String uuid) { return true; } - @Override - public boolean updateBluePrintScope(BluePrintScope scope, String uuid, String userId) { - AwsBluePrint awsBluePrintByUuid = awsBluePrintRepository.findAwsBluePrintByUuid(uuid); - if (awsBluePrintByUuid == null || !awsBluePrintByUuid.getMember().getOauthId().equals(userId)) { - return false; - } - awsBluePrintByUuid.setScope(scope); - awsBluePrintRepository.save(awsBluePrintByUuid); - return true; - } - - // Blueprint 저장 - private AwsBluePrint saveBlueprint(AwsBluePrintDto awsBluePrintDto, String provision, String userId) { - Member member = memberRepository.findMemberByOauthId(userId); - ProvisionStatus status; - if (parseBoolean(provision)) { - status = ProvisionStatus.PROVISIONING; - } else { - status = ProvisionStatus.PENDING; - } - // BluePrint 저장 - String keyname = saveThumbnail(awsBluePrintDto, member);// thumbnail 저장 - - AwsBluePrint awsBluePrint = new AwsBluePrint(); - awsBluePrint.setUuid(awsBluePrintDto.getUuid()); - awsBluePrint.setName(awsBluePrintDto.getName()); - awsBluePrint.setStatus(status); - awsBluePrint.setMember(member); - awsBluePrint.setScope(BluePrintScope.PRIVATE); - awsBluePrint.setKeyName(keyname); - - return awsBluePrintRepository.save(awsBluePrint); - } - - // thumbnail 저장 - private String saveThumbnail(AwsBluePrintDto bluePrint, Member member) { - String objectKey = _getObjectKey(member.getOauthId(), bluePrint.getUuid()); - try { - byte[] svgContent = Base64.getDecoder().decode(awsBluePrintDto.getSvgFile()); - MultipartFile svgFile = new MockMultipartFile("file", objectKey, "image/svg+xml", svgContent); - awsS3Helper.putS3Object(svgFile, objectKey); - } catch (Exception e) { - logger.error("thumbnail upload failed: {}", e.getMessage()); - } - - return objectKey; - } + @Override + public boolean updateBluePrintScope(BluePrintScope scope, String uuid, String userId) { + AwsBluePrint awsBluePrintByUuid = awsBluePrintRepository.findAwsBluePrintByUuid(uuid); + if (awsBluePrintByUuid == null || !awsBluePrintByUuid.getMember().getOauthId().equals(userId)) { + return false; + } + awsBluePrintByUuid.setScope(scope); + awsBluePrintRepository.save(awsBluePrintByUuid); + return true; + } + + // Blueprint 저장 + private AwsBluePrint saveBlueprint(AwsBluePrintDto awsBluePrintDto, String provision, String userId) { + Member member = memberRepository.findMemberByOauthId(userId); + ProvisionStatus status; + if (parseBoolean(provision)) { + status = ProvisionStatus.PROVISIONING; + } else { + status = ProvisionStatus.PENDING; + } + // BluePrint 저장 + String keyname = saveThumbnail(awsBluePrintDto, member);// thumbnail 저장 + + AwsBluePrint awsBluePrint = new AwsBluePrint(); + awsBluePrint.setUuid(awsBluePrintDto.getUuid()); + awsBluePrint.setName(awsBluePrintDto.getName()); + awsBluePrint.setStatus(status); + awsBluePrint.setMember(member); + awsBluePrint.setScope(BluePrintScope.PRIVATE); + awsBluePrint.setKeyName(keyname); + + return awsBluePrintRepository.save(awsBluePrint); + } + + // thumbnail 저장 + private String saveThumbnail(AwsBluePrintDto bluePrint, Member member) { + String objectKey = _getObjectKey(member.getOauthId(), bluePrint.getUuid()); + try { + byte[] svgContent = Base64.getDecoder().decode(bluePrint.getSvgFile()); + MultipartFile svgFile = new MockMultipartFile("file", objectKey, "image/svg+xml", svgContent); + awsS3Helper.putS3Object(svgFile, objectKey); + } catch (Exception e) { + logger.error("thumbnail upload failed: {}", e.getMessage()); + } + + return objectKey; + } // ComponentLine 저장 private void saveComponentLines(AwsBluePrint blueprint, List lines) {