mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2024-11-21 01:21:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(backend): refine caching for avatar urls

Browse Source
This commit is contained in:
MiniDigger | Martin 2023-01-07 13:20:52 +01:00
parent 25a0c1bf03
commit 5c34045b7c
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
backend/src/main/java/io/papermc/hangar/service/internal/AvatarService.java
View File

@ -99,27 +99,35 @@ public class AvatarService extends HangarComponent {
* Get methods
*/
public String getUserAvatarUrl(final UserTable userTable) {
return this.getAvatarUrl(USER, userTable.getUuid().toString());
return this.cache.get("user-" + userTable.getUuid().toString(), (key) ->
this.getAvatarUrl(USER, userTable.getUuid().toString())
);
}
public String getUserAvatarUrl(final User user) {
if (user instanceof HangarUser hangarUser) {
return this.getAvatarUrl(USER, hangarUser.getUuid().toString());
}
return this.getAvatarUrl(USER, this.userDAO.getUserTable(user.getName()).getUuid().toString());
return this.cache.get("user-" + user.getName(), (key) -> {
if (user instanceof HangarUser hangarUser) {
return this.getAvatarUrl(USER, hangarUser.getUuid().toString());
}
return this.getAvatarUrl(USER, this.userDAO.getUserTable(user.getName()).getUuid().toString());
});
}
public String getOrgAvatar(final UUID orgUserUuid) {
return this.getAvatarUrl(USER, orgUserUuid.toString());
return this.cache.get("org-" + orgUserUuid.toString(), (key) ->
this.getAvatarUrl(USER, orgUserUuid.toString())
);
}
public String getProjectAvatarUrl(final long projectId, final String ownerName) {
final UserTable userTable = this.userDAO.getUserTable(ownerName);
if (userTable != null) {
return this.getAvatarUrl(PROJECT, projectId + "", USER, userTable.getUuid().toString());
} else {
return this.getAvatarUrl(PROJECT, projectId + "");
}
return this.cache.get("project-" + projectId, (key) -> {
final UserTable userTable = this.userDAO.getUserTable(ownerName);
if (userTable != null) {
return this.getAvatarUrl(PROJECT, projectId + "", USER, userTable.getUuid().toString());
} else {
return this.getAvatarUrl(PROJECT, projectId + "");
}
});
}
private String getAvatarUrl(final String type, final String subject) {
@ -131,13 +139,11 @@ public class AvatarService extends HangarComponent {
return "https://docs.papermc.io/img/paper.png";
}
return this.cache.get(type + "-" + subject, (key) -> {
try {
return this.restTemplate.getForObject(this.config.security.api().url() + "/avatar/" + type + "/" + subject + (defaultType != null && defaultSubject != null ? "/" + defaultType + "/" + defaultSubject : "") + "?apiKey=" + this.config.sso.apiKey(), String.class);
} catch (final HttpStatusCodeException ex) {
throw new ResponseStatusException(ex.getStatusCode(), "Error from auth api: " + ex.getMessage(), ex);
}
});
try {
return this.restTemplate.getForObject(this.config.security.api().url() + "/avatar/" + type + "/" + subject + (defaultType != null && defaultSubject != null ? "/" + defaultType + "/" + defaultSubject : "") + "?apiKey=" + this.config.sso.apiKey(), String.class);
} catch (final HttpStatusCodeException ex) {
throw new ResponseStatusException(ex.getStatusCode(), "Error from auth api: " + ex.getMessage(), ex);
}
}
private void checkEnabled() {