Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
689a9ca
Removing star imports
jchavez137 May 24, 2023
a7a9adc
Removing repeated method to be in Util Class. Removing unused Class A…
jchavez137 May 25, 2023
2db03e4
Refactoring util method to use constants
jchavez137 May 25, 2023
6ca6a73
Refactoring constants location
jchavez137 May 25, 2023
a884e08
Restoring indentation
jchavez137 May 25, 2023
ada888f
Adding unit tests
jchavez137 May 26, 2023
b47bd48
Refactoring endpoint paths to be string sterpolation, for optimal con…
jchavez137 May 31, 2023
85c3d37
Adding new forward endpoints and creating oldSupported endpoints for …
jchavez137 Jun 2, 2023
bc0d3ef
Adding new forward endpoints and creating oldSupported endpoints for …
jchavez137 Jun 2, 2023
073b174
Pulling back Controller Interceptor to consolidate separated endpoint…
jchavez137 Jun 6, 2023
18fbec9
Consolidating endpoints, cleaning code, removing unused DTOs, impleme…
jchavez137 Jun 6, 2023
e902ba8
Fixing Admin Reindex controller endpoint
jchavez137 Jun 7, 2023
6654b26
Reverting back to separated endpoints, removing unnecessary util clas…
jchavez137 Jun 2, 2023
d9b837b
Removing interface, splitting task endpoint
jchavez137 Jun 7, 2023
074e87a
Removing unused function, consolidating missing endpoints. removing u…
jchavez137 Jun 8, 2023
45d2e76
reverting back route interpolation definition, removing blank lines, …
jchavez137 Jun 13, 2023
8e02b0d
setting result endpoints to its corresponding version, adding first l…
jchavez137 Jun 14, 2023
cacbbb8
Correcting logic mapping author and Cat List, securing apiVersion cal…
jchavez137 Jun 14, 2023
98a1b32
Reverting back the original endpoints for export custom and library c…
jchavez137 Jun 14, 2023
7bca9b7
Correcting PR comments, removing function from RoutePaths
jchavez137 Jun 14, 2023
36bea03
Correcting indentation in modified files, Adding Unit test for ApiSki…
jchavez137 Jun 15, 2023
c6e82e6
Enriching Unit test for ApiSkillUpdateMapper
jchavez137 Jun 15, 2023
138e07d
Created openapi files for v2 and v3
wgu-edwin Jun 5, 2023
3512725
Updated openapi-v2 file with correct endpoints
wgu-edwin Jun 6, 2023
0576e69
added the missing endpoint for skills/{uuid}
wgu-edwin Jun 6, 2023
d8f598b
Removed old unversionded openapi spec file
wgu-edwin Jun 6, 2023
b68320a
Moved tests inside versioned directories.
wgu-edwin Jun 7, 2023
787227f
added new script files for docker cleanup and load CI data
wgu-edwin Jun 8, 2023
4624529
Extrapolated docker and load ci data functions to own files.
wgu-edwin Jun 12, 2023
5910e5b
Fixed functions for clean docker and load/reindex ci data
wgu-edwin Jun 12, 2023
46003df
Successfully ran the version tests twice.
wgu-edwin Jun 13, 2023
7f2f3b9
Fixing v2 api tests
wgu-edwin Jun 13, 2023
456d7c0
fixed a few test files to match updates to v2 endpoints
wgu-edwin Jun 14, 2023
d637265
renamed stop api script file to better match the start osmt app
wgu-edwin Jun 14, 2023
cf49499
Fixed a few spots i missed when i renamed stop osmt app file
wgu-edwin Jun 14, 2023
63acb5a
Fixed rebase errors
wgu-edwin Jun 15, 2023
f4bf55a
fixed a few white spaces and imports from rebase mistake
wgu-edwin Jun 16, 2023
bcae6db
missed a few the first time around
wgu-edwin Jun 16, 2023
9cfd669
Test updates
Corpratespaz Jun 22, 2023
0fdc2f2
Whitespace and other minor fixes
Corpratespaz Jun 22, 2023
bd566b2
Shell script updates
Corpratespaz Jun 22, 2023
69cbcb8
Changes to make API test stack start and teardown more consistent
JohnKallies Jun 22, 2023
1aaba1e
Fix logger typos in pre_test_setup.sh
JohnKallies Jun 22, 2023
72dd110
git ignore file is more inclusive for any postman collection files un…
wgu-edwin Jun 23, 2023
a22118b
Delete osmt-testing.postman_collection.json
JohnKallies Jun 23, 2023
099f9ff
Delete osmt.postman_collection.json
JohnKallies Jun 23, 2023
cd132d9
Updated API tests around workspaces, obfuscated personal info from tests
JohnKallies Jun 23, 2023
f805726
Updated tests to address race condition
Corpratespaz Jun 23, 2023
62b0005
Fixed message logs
Corpratespaz Jun 28, 2023
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
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ osmt*.env

# Testing ENV
# Created at runtime
/test/postman/osmt.postman_collection.json
/test/postman/osmt-testing.postman_collection.json
/test/**/*.postman_collection.json
/test/postman/osmt-auth.environment.json
/test/postman/token.env
/test/node_modules
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,28 @@ internal class RichSkillControllerTest @Autowired constructor(
assertThat(result).isEqualTo("forward:/v3/skills/"+skillResult.searchHits[0].id.toString())
}

@Test
fun testByUUIDHtmlViewV2(){
// Arrange
val numOfSkills = 3
val richSkillRows = mockData.getRichSkillRows()
val listOfRichSkillRows = mutableListOf<RichSkillRow>()
val jwt = Jwt.withTokenValue("foo").header("foo", "foo").claim("foo", "foo").build()

for (i in 1..numOfSkills ) {
listOfRichSkillRows.add(richSkillRows[i])
}

batchImportRichSkill.handleRows(listOfRichSkillRows)

// Act
val skillResult = richSkillEsRepo.byApiSearch(ApiSearch())
val result = richSkillController.byUUIDHtmlViewV2(skillResult.searchHits[0].id.toString(),jwt)

// Assert
assertThat(result).isEqualTo("forward:/v2/skills/"+skillResult.searchHits[0].id.toString())
}

@Test
fun testByUUIDCsvView(){
// Arrange
Expand Down Expand Up @@ -268,7 +290,6 @@ internal class RichSkillControllerTest @Autowired constructor(
Mockito.`when`(securityContext.authentication).thenReturn(authentication)
Mockito.`when`(SecurityContextHolder.getContext().authentication.authorities).thenReturn(authorities)


val responseHeaders = HttpHeaders()
responseHeaders.add("Content-Type", MediaType.APPLICATION_JSON_VALUE)
val headers : MutableMap<String, Any> = HashMap()
Expand All @@ -290,6 +311,4 @@ internal class RichSkillControllerTest @Autowired constructor(
assertThat(result.body?.uuid).isNotBlank()
}



}
}
299 changes: 0 additions & 299 deletions docs/int/archive/osmt-v0.5.x-openapi3.yaml

This file was deleted.

Loading