Skip to content

Commit

Permalink
chore: Added license plan to tenant (#25063)
Browse files Browse the repository at this point in the history
## Description

Added LicensePlan to tenant to get details about the user's current plan

#### Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## Testing
>
#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [x] Manual
- [x] JUnit
- [ ] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
  • Loading branch information
vishnu-gp authored Jul 4, 2023
1 parent 48bf4a2 commit b4a883c
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.appsmith.server.constants.ce;

public enum LicensePlan {
FREE
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package com.appsmith.server.domains;


/**
* Deprecated since we use plans based on the license and this information is stored inside license tenant pricingPlan is no longer used
*/
@Deprecated
public enum PricingPlan {
FREE, STARTUP, BUSINESS, ENTERPRISE
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.appsmith.server.domains.ce;

import com.appsmith.server.constants.ce.LicensePlan;
import com.appsmith.server.domains.TenantConfiguration;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
Expand Down Expand Up @@ -33,6 +34,15 @@ public void addThirdPartyAuth(String auth) {

public void copyNonSensitiveValues(TenantConfiguration tenantConfiguration) {
this.instanceName = tenantConfiguration.getInstanceName();
License license = new License();
license.setPlan(LicensePlan.FREE);
this.license = license;
}

License license;
@Data
public static class License {
LicensePlan plan;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.appsmith.server.services.ce;

import com.appsmith.server.constants.ce.LicensePlan;
import com.appsmith.server.services.TenantService;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.security.test.context.support.WithUserDetails;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import reactor.test.StepVerifier;

import static org.assertj.core.api.Assertions.assertThat;


@SpringBootTest
@ExtendWith(SpringExtension.class)
public class TenantServiceCETest {
@Autowired
TenantService tenantService;

@Test
@WithUserDetails("anonymousUser")
public void getTenantConfig_Valid_AnonymousUser() {
StepVerifier.create(tenantService.getTenantConfiguration())
.assertNext(tenant -> {
assertThat(tenant.getTenantConfiguration()).isNotNull();
assertThat(tenant.getTenantConfiguration().getLicense()).isNotNull();
assertThat(tenant.getTenantConfiguration().getLicense().getPlan()).isEqualTo(LicensePlan.FREE);
})
.verifyComplete();

}
}

0 comments on commit b4a883c

Please sign in to comment.