jessebrault/meals-made-easy-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed typo with mainImage in RecipeUpdateSpec.

Browse Source
This commit is contained in:
Jesse Brault 2024-08-17 11:11:16 -05:00
parent aeadd07f70
commit 66242845d6
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/integrationTest/java/app/mealsmadeeasy/api/recipe/RecipeControllerTests.java
View File

@ -323,7 +323,7 @@ public class RecipeControllerTests {
final RecipeUpdateSpec.MainImageUpdateSpec mainImageUpdateSpec = new RecipeUpdateSpec.MainImageUpdateSpec(); final RecipeUpdateSpec.MainImageUpdateSpec mainImageUpdateSpec = new RecipeUpdateSpec.MainImageUpdateSpec();
mainImageUpdateSpec.setUsername(hal9000.getOwner().getUsername()); mainImageUpdateSpec.setUsername(hal9000.getOwner().getUsername());
mainImageUpdateSpec.setFilename(hal9000.getUserFilename()); mainImageUpdateSpec.setFilename(hal9000.getUserFilename());
updateSpec.setMainImageUpdateSpec(mainImageUpdateSpec); updateSpec.setMainImage(mainImageUpdateSpec);
final String body = this.objectMapper.writeValueAsString(updateSpec); final String body = this.objectMapper.writeValueAsString(updateSpec);
final String accessToken = this.getAccessToken(owner); final String accessToken = this.getAccessToken(owner);

6
src/main/java/app/mealsmadeeasy/api/recipe/RecipeServiceImpl.java
View File

@ -219,12 +219,12 @@ public class RecipeServiceImpl implements RecipeService {
recipe.setPublic(spec.getIsPublic()); recipe.setPublic(spec.getIsPublic());
final S3ImageEntity mainImage; final S3ImageEntity mainImage;
if (spec.getMainImageUpdateSpec() == null) { if (spec.getMainImage() == null) {
mainImage = null; mainImage = null;
} else { } else {
mainImage = (S3ImageEntity) this.imageService.getByUsernameAndFilename( mainImage = (S3ImageEntity) this.imageService.getByUsernameAndFilename(
spec.getMainImageUpdateSpec().getUsername(), spec.getMainImage().getUsername(),
spec.getMainImageUpdateSpec().getFilename(), spec.getMainImage().getFilename(),
modifier modifier
); );
} }

16
src/main/java/app/mealsmadeeasy/api/recipe/spec/RecipeUpdateSpec.java
View File

@ -38,7 +38,7 @@ public class RecipeUpdateSpec {
private @Nullable Integer totalTime; private @Nullable Integer totalTime;
private String rawText; private String rawText;
private boolean isPublic; private boolean isPublic;
private @Nullable MainImageUpdateSpec mainImageUpdateSpec; private @Nullable MainImageUpdateSpec mainImage;
public RecipeUpdateSpec() {} public RecipeUpdateSpec() {}
@ -56,9 +56,9 @@ public class RecipeUpdateSpec {
this.isPublic = recipe.isPublic(); this.isPublic = recipe.isPublic();
final @Nullable Image mainImage = recipe.getMainImage(); final @Nullable Image mainImage = recipe.getMainImage();
if (mainImage != null) { if (mainImage != null) {
this.mainImageUpdateSpec = new MainImageUpdateSpec(); this.mainImage = new MainImageUpdateSpec();
this.mainImageUpdateSpec.setUsername(mainImage.getOwner().getUsername()); this.mainImage.setUsername(mainImage.getOwner().getUsername());
this.mainImageUpdateSpec.setFilename(mainImage.getUserFilename()); this.mainImage.setFilename(mainImage.getUserFilename());
} }
} }
@ -110,12 +110,12 @@ public class RecipeUpdateSpec {
this.isPublic = isPublic; this.isPublic = isPublic;
} }
public @Nullable MainImageUpdateSpec getMainImageUpdateSpec() { public @Nullable MainImageUpdateSpec getMainImage() {
return this.mainImageUpdateSpec; return this.mainImage;
} }
public void setMainImageUpdateSpec(@Nullable MainImageUpdateSpec mainImageUpdateSpec) { public void setMainImage(@Nullable MainImageUpdateSpec mainImage) {
this.mainImageUpdateSpec = mainImageUpdateSpec; this.mainImage = mainImage;
} }
} }