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.

Sign up for GitHub

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

Jump to bottom

Merge Space Templates - Meeds-io/MIPs#150 #604

Merged
merged 4 commits into from
Nov 4, 2024
Merged

Merge Space Templates - Meeds-io/MIPs#150 #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
295b859
feat: Update Space URL computing - Meeds-io/MIPs#150
boubaker Oct 20, 2024
09e95be
feat: Delete SpaceService.getSpaceByUrl API - Meeds-io/MIPs#150
boubaker Oct 21, 2024
a2573a6
feat: Delete Space.getSpaceByDisplayName API - Meeds-io/MIPs#150
boubaker Oct 21, 2024
5bf18cb
feat: Replace StringUtils package name - Meeds-io/MIPs#150
boubaker Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions wallet-api/src/main/java/org/exoplatform/wallet/utils/WalletUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,13 +487,7 @@ public static Space getSpace(String id) {
if (space == null) {
space = spaceService.getSpaceByGroupId("/spaces/" + id);
if (space == null) {
space = spaceService.getSpaceByDisplayName(id);
if (space == null) {
space = spaceService.getSpaceByUrl(id);
if (space == null) {
space = spaceService.getSpaceById(id);
}
}
space = spaceService.getSpaceById(id);
}
}
return space;
Expand Down
10 changes: 8 additions & 2 deletions ...rc/main/java/org/exoplatform/wallet/reward/notification/RewardSuccessTemplateBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
*/
package org.exoplatform.wallet.reward.notification;

import static org.exoplatform.wallet.utils.RewardUtils.*;
import static org.exoplatform.wallet.utils.RewardUtils.REWARD_END_PERIOD_DATE;
import static org.exoplatform.wallet.utils.RewardUtils.REWARD_END_PERIOD_DATE_FORMATTED;
import static org.exoplatform.wallet.utils.RewardUtils.REWARD_START_PERIOD_DATE;
import static org.exoplatform.wallet.utils.RewardUtils.REWARD_START_PERIOD_DATE_FORMATTED;
import static org.exoplatform.wallet.utils.RewardUtils.formatTime;
import static org.exoplatform.wallet.utils.WalletUtils.AMOUNT;
import static org.exoplatform.wallet.utils.WalletUtils.formatNumber;

Expand All @@ -29,7 +33,9 @@

import org.exoplatform.commons.api.notification.NotificationContext;
import org.exoplatform.commons.api.notification.channel.template.AbstractTemplateBuilder;
import org.exoplatform.commons.api.notification.model.*;
import org.exoplatform.commons.api.notification.model.ChannelKey;
import org.exoplatform.commons.api.notification.model.MessageInfo;
import org.exoplatform.commons.api.notification.model.NotificationInfo;
import org.exoplatform.commons.api.notification.service.template.TemplateContext;
import org.exoplatform.commons.notification.template.TemplateUtils;
import org.exoplatform.container.ExoContainer;
Expand Down
10 changes: 0 additions & 10 deletions ...ward-services/src/test/java/org/exoplatform/wallet/reward/test/mock/SpaceServiceMock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,6 @@ public void unregisterSpaceListenerPlugin(SpaceListenerPlugin spaceListenerPlugi

}

public void setSpaceApplicationConfigPlugin(SpaceApplicationConfigPlugin spaceApplicationConfigPlugin) {
throw new UnsupportedOperationException();

}

public SpaceApplicationConfigPlugin getSpaceApplicationConfigPlugin() {
throw new UnsupportedOperationException();

}

public List<Space> getAllSpaces() throws SpaceException {
throw new UnsupportedOperationException();

Expand Down
7 changes: 1 addition & 6 deletions wallet-services/src/main/java/io/meeds/wallet/permlink/plugin/WalletPermanentLinkPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,7 @@ public String getDirectAccessUrl(PermanentLinkObject object) throws ObjectNotFou
}

public String getSpaceUrl(Space space) {
StringBuilder spaceUrl = new StringBuilder("/portal/g/");
spaceUrl.append(space.getGroupId().replace("/", ":"))
.append("/")
.append(space.getPrettyName())
.append("/SpaceWallet");
return spaceUrl.toString();
return String.format("/portal/s/%s/SpaceWallet", space.getId());
}

public String getProfileUrl() {
Expand Down
2 changes: 1 addition & 1 deletion wallet-services/src/test/java/org/exoplatform/wallet/test/mock/IdentityManagerMock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;

import org.apache.commons.codec.binary.StringUtils;
import org.apache.commons.lang3.StringUtils;

import org.exoplatform.commons.utils.ListAccess;
import org.exoplatform.social.core.identity.IdentityProvider;
Expand Down