neviyn/ObservationDatabase
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fixed formatting.

Browse Source
This commit is contained in:
neviyn 2018-10-09 16:39:44 +01:00
parent 2013c4b84b
commit 185f258b6f
5 changed files with 149 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Api.kt
View File

@ -3,59 +3,59 @@ package uk.co.neviyn.observationdatabase
import org.joda.time.LocalDate
data class NameValue(
val text: String,
val value: Long
val text: String,
val value: Long
)
data class NewSite(
val name: String
val name: String
)
data class NewTutor(
val name: String,
val siteId: Long
val name: String,
val siteId: Long
)
data class SimpleObservation(
val date: LocalDate,
val type: TrainingType,
val observed: String,
val whom: String,
val entries: List<Entry>
){
val date: LocalDate,
val type: TrainingType,
val observed: String,
val whom: String,
val entries: List<Entry>
) {
constructor(observation: Observation) : this(observation.date, observation.type,
observation.observed, observation.whom, observation.entries)
observation.observed, observation.whom, observation.entries)
}
data class NewObservation(
val site: Long,
val type: TrainingType,
val observed: String,
val whom: String,
val entries: List<Entry>,
val tutors: List<Long>
val site: Long,
val type: TrainingType,
val observed: String,
val whom: String,
val entries: List<Entry>,
val tutors: List<Long>
)
data class ObservationsRequest(
val site: Long?,
val tutor: Long?,
val whom: String?,
val startDate: LocalDate,
val endDate: LocalDate
val site: Long?,
val tutor: Long?,
val whom: String?,
val startDate: LocalDate,
val endDate: LocalDate
)
data class ChartData(
val labels: List<String>,
val datasets: List<ChartDataset>
val labels: List<String>,
val datasets: List<ChartDataset>
)
data class ChartDataset(
val label: String,
val backgroundColor: String,
val borderColor: String,
val data: List<Double>,
val fill: Boolean = false,
val lineTension: Double = 0.1
){
constructor(label: String, color: String, data: List<Double>): this(label, color, color, data)
val label: String,
val backgroundColor: String,
val borderColor: String,
val data: List<Double>,
val fill: Boolean = false,
val lineTension: Double = 0.1
) {
constructor(label: String, color: String, data: List<Double>) : this(label, color, color, data)
}

96
backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Controller.kt
View File

@ -75,9 +75,9 @@ class Controller {
*/
@GetMapping("/tutor/{id}/observations")
fun getObservationsForTutor(@PathVariable(value = "id") id: Long): List<SimpleObservation> =
tutorRepository.findById(id).map { tutor ->
tutor.observations.map { SimpleObservation(it) }
}.orElse(listOf())
tutorRepository.findById(id).map { tutor ->
tutor.observations.map { SimpleObservation(it) }
}.orElse(listOf())
/**
* Add a new observation to the database using data provided in [newObservation].
@ -89,22 +89,22 @@ class Controller {
if (!site.isPresent) return null
if (tutors.isEmpty() || tutors.size != newObservation.tutors.size) return null
val overallScores = newObservation.entries.asSequence().groupBy { it.type }
.map { entry -> entry.key to entry.value.asSequence().mapNotNull { it.rating }.average() }
.map { it.first to if (it.second > 0) it.second else null }.toList()
.toMap()
.map { entry -> entry.key to entry.value.asSequence().mapNotNull { it.rating }.average() }
.map { it.first to if (it.second > 0) it.second else null }.toList()
.toMap()
var observation = Observation(
site = site.get(),
date = LocalDate.now(),
type = newObservation.type,
observed = newObservation.observed,
whom = newObservation.whom,
monitoring = overallScores[RatingCategory.MONITORING],
conservatism = overallScores[RatingCategory.CONSERVATISM],
control = overallScores[RatingCategory.CONTROL],
teamwork = overallScores[RatingCategory.TEAMWORK],
knowledge = overallScores[RatingCategory.KNOWLEDGE],
entries = newObservation.entries,
tutors = tutors
site = site.get(),
date = LocalDate.now(),
type = newObservation.type,
observed = newObservation.observed,
whom = newObservation.whom,
monitoring = overallScores[RatingCategory.MONITORING],
conservatism = overallScores[RatingCategory.CONSERVATISM],
control = overallScores[RatingCategory.CONTROL],
teamwork = overallScores[RatingCategory.TEAMWORK],
knowledge = overallScores[RatingCategory.KNOWLEDGE],
entries = newObservation.entries,
tutors = tutors
)
observation = observationRepository.save(observation)
tutors.forEach {
@ -123,12 +123,12 @@ class Controller {
return tutorRepository.findById(observationsRequest.tutor).map {
when {
(observationsRequest.whom == null || observationsRequest.whom.isEmpty()) -> observationRepository.findByTutorsAndDateBetween(tutor = it,
startDate = observationsRequest.startDate,
endDate = observationsRequest.endDate)
startDate = observationsRequest.startDate,
endDate = observationsRequest.endDate)
else -> observationRepository.findByTutorsAndWhomAndDateBetween(tutor = it,
whom = observationsRequest.whom,
startDate = observationsRequest.startDate,
endDate = observationsRequest.endDate)
whom = observationsRequest.whom,
startDate = observationsRequest.startDate,
endDate = observationsRequest.endDate)
}
}.orElse(listOf())
}
@ -136,12 +136,12 @@ class Controller {
return siteRepository.findById(observationsRequest.site).map {
when {
(observationsRequest.whom == null || observationsRequest.whom.isEmpty()) -> observationRepository.findBySiteAndDateBetween(site = it,
startDate = observationsRequest.startDate,
endDate = observationsRequest.endDate)
startDate = observationsRequest.startDate,
endDate = observationsRequest.endDate)
else -> observationRepository.findBySiteAndWhomAndDateBetween(site = it,
whom = observationsRequest.whom,
startDate = observationsRequest.startDate,
endDate = observationsRequest.endDate)
whom = observationsRequest.whom,
startDate = observationsRequest.startDate,
endDate = observationsRequest.endDate)
}
}.orElse(listOf())
}
@ -158,33 +158,33 @@ class Controller {
if (data.isEmpty()) return ChartData(listOf(), listOf())
val groupedData = data.asSequence().groupBy { it.date }.map { entry ->
AverageData(
entry.value.asSequence().mapNotNull { it.monitoring }.average(),
entry.value.asSequence().mapNotNull { it.control }.average(),
entry.value.asSequence().mapNotNull { it.conservatism }.average(),
entry.value.asSequence().mapNotNull { it.teamwork }.average(),
entry.value.asSequence().mapNotNull { it.knowledge }.average(),
entry.key
entry.value.asSequence().mapNotNull { it.monitoring }.average(),
entry.value.asSequence().mapNotNull { it.control }.average(),
entry.value.asSequence().mapNotNull { it.conservatism }.average(),
entry.value.asSequence().mapNotNull { it.teamwork }.average(),
entry.value.asSequence().mapNotNull { it.knowledge }.average(),
entry.key
)
}.toList()
val dates = groupedData.map { it.date.toString("yyyy-MM-dd") }
return ChartData(
labels = dates,
datasets = listOf(
ChartDataset("Monitoring", "#F90", groupedData.map { it.monitoring }),
ChartDataset("Control", "#3F0", groupedData.map { it.control }),
ChartDataset("Conservatism", "#33F", groupedData.map { it.conservatism }),
ChartDataset("Teamwork", "#FF0", groupedData.map { it.teamwork }),
ChartDataset("Knowledge", "#000", groupedData.map { it.knowledge })
)
labels = dates,
datasets = listOf(
ChartDataset("Monitoring", "#F90", groupedData.map { it.monitoring }),
ChartDataset("Control", "#3F0", groupedData.map { it.control }),
ChartDataset("Conservatism", "#33F", groupedData.map { it.conservatism }),
ChartDataset("Teamwork", "#FF0", groupedData.map { it.teamwork }),
ChartDataset("Knowledge", "#000", groupedData.map { it.knowledge })
)
)
}
}
data class AverageData(
val monitoring: Double,
val control: Double,
val conservatism: Double,
val teamwork: Double,
val knowledge: Double,
val date: LocalDate
val monitoring: Double,
val control: Double,
val conservatism: Double,
val teamwork: Double,
val knowledge: Double,
val date: LocalDate
)

105
backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Entity.kt
View File

@ -24,10 +24,11 @@ import javax.persistence.Table
*/
@Entity
data class Site(
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
val id: Long = 0,
val name: String){
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
val id: Long = 0,
val name: String
) {
@OneToMany(fetch = FetchType.LAZY)
val tutors: MutableSet<Tutor> = mutableSetOf()
}
@ -37,18 +38,18 @@ data class Site(
*/
@Entity
data class Tutor(
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
val id: Long = 0,
val name: String,
@ManyToOne(fetch = FetchType.LAZY)
val site: Site
){
@ManyToMany
@JoinTable(name = "tutor_observations",
joinColumns = [JoinColumn(name =" tutor_id", referencedColumnName = "id")],
inverseJoinColumns = [JoinColumn(name = "observation_id", referencedColumnName = "id")])
val observations: MutableSet<Observation> = mutableSetOf()
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
val id: Long = 0,
val name: String,
@ManyToOne(fetch = FetchType.LAZY)
val site: Site
) {
@ManyToMany
@JoinTable(name = "tutor_observations",
joinColumns = [JoinColumn(name = " tutor_id", referencedColumnName = "id")],
inverseJoinColumns = [JoinColumn(name = "observation_id", referencedColumnName = "id")])
val observations: MutableSet<Observation> = mutableSetOf()
}
enum class TrainingType {
@ -65,30 +66,30 @@ enum class RatingCategory {
@Entity
@Table(indexes = [Index(name = "dateIndex", columnList = "date")])
data class Observation(
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
val id: Long = 0,
@JsonIgnore
@ManyToOne
val site: Site,
@Column(nullable = false, name = "date")
val date: LocalDate,
@Column(nullable = false)
val type: TrainingType,
@Column(nullable = false)
val observed: String,
@Column(nullable = false)
val whom: String,
val monitoring: Double?,
val control: Double?,
val conservatism: Double?,
val teamwork: Double?,
val knowledge: Double?,
@ElementCollection
val entries: List<Entry>,
@JsonIgnore
@ManyToMany(mappedBy = "observations")
val tutors: Set<Tutor>
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
val id: Long = 0,
@JsonIgnore
@ManyToOne
val site: Site,
@Column(nullable = false, name = "date")
val date: LocalDate,
@Column(nullable = false)
val type: TrainingType,
@Column(nullable = false)
val observed: String,
@Column(nullable = false)
val whom: String,
val monitoring: Double?,
val control: Double?,
val conservatism: Double?,
val teamwork: Double?,
val knowledge: Double?,
@ElementCollection
val entries: List<Entry>,
@JsonIgnore
@ManyToMany(mappedBy = "observations")
val tutors: Set<Tutor>
)
/**
@ -96,16 +97,16 @@ data class Observation(
*/
@Embeddable
data class Entry(
@Column(nullable = false)
@JsonProperty
val type: RatingCategory,
@Column(nullable = false)
@JsonProperty
val rating: Int,
@Column(nullable = false, columnDefinition = "TEXT")
@JsonProperty
val strengths: String,
@Column(nullable = false, columnDefinition = "TEXT")
@JsonProperty
val improvements: String
@Column(nullable = false)
@JsonProperty
val type: RatingCategory,
@Column(nullable = false)
@JsonProperty
val rating: Int,
@Column(nullable = false, columnDefinition = "TEXT")
@JsonProperty
val strengths: String,
@Column(nullable = false, columnDefinition = "TEXT")
@JsonProperty
val improvements: String
)

7
backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Repository.kt
View File

@ -6,13 +6,14 @@ import org.springframework.data.repository.CrudRepository
import org.springframework.stereotype.Repository
@Repository
interface SiteRepository: CrudRepository<Site, Long>
interface SiteRepository : CrudRepository<Site, Long>
@Repository
interface TutorRepository: CrudRepository<Tutor, Long>
interface TutorRepository : CrudRepository<Tutor, Long>
@Repository
interface ObservationRepository: CrudRepository<Observation, Long>, JpaSpecificationExecutor<Observation> {
interface ObservationRepository : CrudRepository<Observation, Long>, JpaSpecificationExecutor<Observation> {
fun findBySiteAndDateBetween(site: Site, startDate: LocalDate, endDate: LocalDate): List<Observation>
fun findByTutorsAndDateBetween(tutor: Tutor, startDate: LocalDate, endDate: LocalDate): List<Observation>

24
backend/src/main/kotlin/uk/co/neviyn/observationdatabase/Security.kt
View File

@ -19,7 +19,6 @@ import javax.servlet.ServletException
import javax.servlet.http.HttpServletRequest
import javax.servlet.http.HttpServletResponse
@Configuration
@EnableWebSecurity
class CustomWebSecurityConfigurerAdapter : WebSecurityConfigurerAdapter() {
@ -31,20 +30,20 @@ class CustomWebSecurityConfigurerAdapter : WebSecurityConfigurerAdapter() {
@Throws(Exception::class)
fun configureGlobal(auth: AuthenticationManagerBuilder) {
auth.inMemoryAuthentication()
.withUser("admin").password(passwordEncoder().encode("admin"))
.authorities("ROLE_USER")
.withUser("admin").password(passwordEncoder().encode("admin"))
.authorities("ROLE_USER")
}
@Throws(Exception::class)
override fun configure(http: HttpSecurity) {
http.csrf().disable().authorizeRequests()
.antMatchers(HttpMethod.POST, "/api/site", "/api/tutor", "/api/observation").authenticated()
.anyRequest().permitAll()
.and()
.httpBasic()
.authenticationEntryPoint(authenticationEntryPoint)
.and()
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
.antMatchers(HttpMethod.POST, "/api/site", "/api/tutor", "/api/observation").authenticated()
.anyRequest().permitAll()
.and()
.httpBasic()
.authenticationEntryPoint(authenticationEntryPoint)
.and()
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
}
@Bean
@ -54,11 +53,10 @@ class CustomWebSecurityConfigurerAdapter : WebSecurityConfigurerAdapter() {
}
@Component
class MyBasicAuthenticationEntryPoint: BasicAuthenticationEntryPoint() {
class MyBasicAuthenticationEntryPoint : BasicAuthenticationEntryPoint() {
@Throws(IOException::class, ServletException::class)
override fun commence
(request: HttpServletRequest, response: HttpServletResponse, authEx: AuthenticationException) {
override fun commence(request: HttpServletRequest, response: HttpServletResponse, authEx: AuthenticationException) {
response.addHeader("WWW-Authenticate", "Basic realm=\"$realmName\"")
response.status = HttpServletResponse.SC_UNAUTHORIZED
response.writer.println("HTTP Status 401 - " + authEx.message)