Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/main/java/io/apicollab/server/constant/ApiStatus.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public enum ApiStatus {

BETA,
STABLE,
LIVE,
DEPRECATED,
ARCHIVED
}
2 changes: 1 addition & 1 deletion src/main/java/io/apicollab/server/service/ApiService.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ApiService {
@Autowired
private ApiSearchRepository searchRepository;

List<ApiStatus> searchableStatusCodes = asList(ApiStatus.BETA, ApiStatus.STABLE, ApiStatus.DEPRECATED);
List<ApiStatus> searchableStatusCodes = asList(ApiStatus.BETA, ApiStatus.STABLE, ApiStatus.LIVE, ApiStatus.DEPRECATED);

@Transactional
public Api create(Application application, Api api) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/resources/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,9 @@ components:
type: string
enum:
- BETA
- STABLE,
- DEPRECATED,
- STABLE
- LIVE
- DEPRECATED
- ARCHIVED

GenericList:
Expand Down
12 changes: 12 additions & 0 deletions src/test/java/io/apicollab/server/service/ApiSearchTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ public void setup() {
createApi(app, "Space API", "2.0", "technology space time are interesting concepts this", ApiStatus.STABLE);
createApi(app, "Old API", "3.0", " Old technology space time are interesting concepts", ApiStatus.ARCHIVED);
createApi(app, "Tech API", "4.0", "Ban this Tech!", ApiStatus.STABLE);
createApi(app, "Live API", "5.0", "a live api", ApiStatus.LIVE);


}

Expand Down Expand Up @@ -108,6 +110,16 @@ public void searchExcludeArchived() {
assertThat(results.get(0).getName()).isEqualToIgnoringCase("Space API");
}

/**
* Search to ensure Live APIs are returned
*/
@Test
public void searchIncludesLive() {
List<Api> results = apiService.search("live").stream().collect(Collectors.toList());
assertThat(results).hasSize(1);
assertThat(results.get(0).getName()).isEqualToIgnoringCase("Live API");
}

/**
* Case insensitive search
*/
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/io/apicollab/server/service/ApiServiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,19 @@ public void createNew() {
assertThat(dbApi.getApplication().getId()).isEqualTo(dbApplication.getId());
}

@Test
public void createNewWithLiveTag() {
// Create an application
Application application = Application.builder().name("Application_1").email("app1@appcompany.com").build();
Application dbApplication = applicationService.create(application);
Api api = Api.builder().name("Api_1").version("0.1").swaggerDefinition("{}").description("a description").status(ApiStatus.LIVE).build();
Api dbApi = applicationService.createNewApiVersion(dbApplication.getId(), api);

// Retrieve created application
dbApi = apiService.findOne(dbApi.getId());
assertThat(dbApi.getStatus()).isEqualTo(ApiStatus.LIVE);
}

@Test
public void descriptionTruncatedTo255Chars() {
String description = "looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" +
Expand Down