diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/common/notifications/FcmNotificationSender.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/common/notifications/FcmNotificationSender.kt index bc7ea99d4..0829e17fe 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/common/notifications/FcmNotificationSender.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/common/notifications/FcmNotificationSender.kt @@ -18,8 +18,6 @@ class FcmNotificationSender(private val fcm: FirebaseMessaging): INotificationSe /** * Sends empty FCM message on topic - * - * @author Daniil Zavyalov */ override fun sendEmptyMessage(topic: String) { logger.info("Sending an FCM message on $topic topic") @@ -35,8 +33,6 @@ class FcmNotificationSender(private val fcm: FirebaseMessaging): INotificationSe * * @param action will be put as "action" in message data * @param modifiedWorkspace will be put as "object" in message data - * - * @author Daniil Zavyalov */ override fun sendContentMessage(action: HttpMethod, modifiedWorkspace: WorkspaceDTO) { logger.info("Sending an FCM message on workspace topic") @@ -54,8 +50,6 @@ class FcmNotificationSender(private val fcm: FirebaseMessaging): INotificationSe * * @param action will be put as "action" in message data * @param modifiedUser will be put as "object" in message data - * - * @author Daniil Zavyalov */ override fun sendContentMessage(action: HttpMethod, modifiedUser: UserDTO) { logger.info("Sending an FCM message on user topic") @@ -73,8 +67,6 @@ class FcmNotificationSender(private val fcm: FirebaseMessaging): INotificationSe * * @param action will be put as "action" in message data * @param modifiedBooking will be put as "object" in message data - * - * @author Daniil Zavyalov */ override fun sendContentMessage(action: HttpMethod, modifiedBooking: BookingDTO) { logger.info("Sending an FCM message on booking topic") diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/common/notifications/INotificationSender.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/common/notifications/INotificationSender.kt index e07b7c6bf..54beedc24 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/common/notifications/INotificationSender.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/common/notifications/INotificationSender.kt @@ -12,8 +12,6 @@ interface INotificationSender { /** * Sends message about topic modification - * - * @author Daniil Zavyalov */ fun sendEmptyMessage(topic: String) @@ -22,8 +20,6 @@ interface INotificationSender { * * @param action will be put as "action" in message data * @param modifiedWorkspace will be put as "object" in message data - * - * @author Daniil Zavyalov */ fun sendContentMessage(action: HttpMethod, modifiedWorkspace: WorkspaceDTO) @@ -32,8 +28,6 @@ interface INotificationSender { * * @param action will be put as "action" in message data * @param modifiedUser will be put as "object" in message data - * - * @author Daniil Zavyalov */ fun sendContentMessage(action: HttpMethod, modifiedUser: UserDTO) @@ -42,8 +36,6 @@ interface INotificationSender { * * @param action will be put as "action" in message data * @param modifiedBooking will be put as "object" in message data - * - * @author Daniil Zavyalov */ fun sendContentMessage(action: HttpMethod, modifiedBooking: BookingDTO) } \ No newline at end of file diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/repository/AuthRepository.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/repository/AuthRepository.kt index 3b5b768bd..928983ec9 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/repository/AuthRepository.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/repository/AuthRepository.kt @@ -13,8 +13,6 @@ class AuthRepository(private val db: Database) { * @return encrypted api key [String] * @param keyEncrypted encrypted input [String] * @throws InstanceNotFoundException(ApiKeyEntity::class, "No such key found") - * - * @author Kiselev Danil * */ fun findApiKey(keyEncrypted: String): String? { return db.apikeys.find { it.value.eq(keyEncrypted) }?.keyValue diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/ApiKeyAuthorizer.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/ApiKeyAuthorizer.kt index 84bfc9c73..9f743c239 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/ApiKeyAuthorizer.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/ApiKeyAuthorizer.kt @@ -20,7 +20,6 @@ class ApiKeyAuthorizer(private val extractor: TokenExtractor = TokenExtractor()) * Check api key from input line. String encrypting by SHA-256 and comparing with encrypted keys from database. If it cannot find one, throw [InstanceNotFoundException] * @param call [ApplicationCall] which contains token to verify * @return random String - * @author Kiselev Danil */ override suspend fun authorize(call: ApplicationCall): Boolean { diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/AuthorizationPipeline.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/AuthorizationPipeline.kt index 0dd1bff90..7f1d87503 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/AuthorizationPipeline.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/AuthorizationPipeline.kt @@ -31,7 +31,6 @@ class AuthorizationPipeline : Authorizer { * Allow you to add authorizer to pipeline * @param authorizer [Authorizer] * @return [AuthorizationPipeline] - instance of pipeline - * @author Danil Kiselev * */ fun addAuthorizer(authorizer: Authorizer): AuthorizationPipeline { authorizers.add(authorizer) diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/Authorizer.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/Authorizer.kt index b3823b241..0327872d6 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/Authorizer.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/Authorizer.kt @@ -8,7 +8,6 @@ import io.ktor.server.application.* interface Authorizer { /** * @param call [ApplicationCall] incoming call to authorize - * @author Kiselev Danil * */ suspend fun authorize(call: ApplicationCall): Boolean } diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/PermitAuthorizer.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/PermitAuthorizer.kt index 36c386238..c8fa2dbba 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/PermitAuthorizer.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/PermitAuthorizer.kt @@ -8,7 +8,6 @@ import org.slf4j.LoggerFactory /** * Authorizer to permit routes. Permit all child routes, if parent permitted. * Example: "/workspaces" permission allow access to "/workspaces/zones" routes. - * @author Danil Kiselev * */ class PermitAuthorizer(private val permittedPaths: Iterable) : Authorizer { diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/RequestAuthorizer.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/RequestAuthorizer.kt index b4cd58030..724defe36 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/RequestAuthorizer.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/RequestAuthorizer.kt @@ -20,8 +20,6 @@ class RequestAuthorizer(private val extractor: TokenExtractor = TokenExtractor() * * @param call [ApplicationCall] which contains token to verify * @return is token correct - * - * @author Kiselev Danil * */ override suspend fun authorize(call: ApplicationCall): Boolean { val tokenString = extractor.extractToken(call) ?: run { diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/TokenAuthorizer.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/TokenAuthorizer.kt index c7501e467..caf30a6fd 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/TokenAuthorizer.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/TokenAuthorizer.kt @@ -25,11 +25,8 @@ class TokenAuthorizer(private val extractor: TokenExtractor = TokenExtractor()) * Check Google ID Token using google library * * @param call [String] which contains token to verify - * @author Kiselev Danil * @throws Exception("Token wasn't verified by Google") if token does not contain payload * @return is token correct - * - * @author Kiselev Danil * */ override suspend fun authorize(call: ApplicationCall): Boolean { var userMail: String? = null @@ -67,8 +64,6 @@ class TokenAuthorizer(private val extractor: TokenExtractor = TokenExtractor()) * @param email - [String] from Bearer auth header, which must contains email * @throws Exception("Email is empty") if input line is null * @return [String], which contains email address - * - * @author Kiselev Danil * */ private fun extractDomain(email: String?): String { email ?: throw Exception("Email is empty") diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/TokenExtractor.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/TokenExtractor.kt index ac3543553..f8779db82 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/TokenExtractor.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/auth/service/TokenExtractor.kt @@ -9,7 +9,6 @@ class TokenExtractor { /** * @param call [ApplicationCall] incoming call * @return token from Bearer Auth header or null, if - * @author Danil Kiselev * */ fun extractToken(call: ApplicationCall): String? { val logger = LoggerFactory.getLogger(this::class.java) diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/BookingDtoModelConverter.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/BookingDtoModelConverter.kt index ae6de3a30..8305f3213 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/BookingDtoModelConverter.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/BookingDtoModelConverter.kt @@ -35,7 +35,6 @@ class BookingDtoModelConverter( * * @param booking [Booking] to be converted * @return The resulting [BookingDTO] object - * @author Daniil Zavyalov, Danil Kiselev */ @Deprecated( message = "Deprecated since 1.0 api version", @@ -65,7 +64,6 @@ class BookingDtoModelConverter( * @throws [MissingIdException] if [booking] doesn't contain an id * @param booking [Booking] to be converted * @return The resulting [BookingResponseDTO] object - * @author Daniil Zavyalov, Danil Kiselev */ fun modelToResponseDto(booking: Booking): BookingResponseDTO { logger.trace("Converting booking model to response dto") @@ -96,7 +94,6 @@ class BookingDtoModelConverter( * * @param bookingDTO [BookingDTO] to be converted * @return The resulting [Booking] object - * @author Daniil Zavyalov, Danil Kiselev */ @Deprecated( message = "Deprecated since 1.0 api version", @@ -127,7 +124,6 @@ class BookingDtoModelConverter( * @return The resulting [Booking] object * @throws [InstanceNotFoundException] if user with the given email or * workspace with the given id doesn't exist in database - * @author Daniil Zavyalov, Danil Kiselev */ fun requestDtoToModel(bookingDto: BookingRequestDTO, id: String? = null): Booking { logger.trace("Converting booking response dto to model") diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/BookingRepositoryConverter.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/BookingRepositoryConverter.kt index f51200e60..c55ceb08e 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/BookingRepositoryConverter.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/BookingRepositoryConverter.kt @@ -44,7 +44,6 @@ class BookingRepositoryConverter(private val database: Database, * @param bookingEntity [WorkspaceBookingEntity] to be converted * @param participants users who participate in the booking * @return The resulting [Booking] object - * @author Daniil Zavyalov */ fun entityToModel(bookingEntity: WorkspaceBookingEntity, participants: List): Booking { @@ -71,7 +70,6 @@ class BookingRepositoryConverter(private val database: Database, * @return The resulting [WorkspaceBookingEntity] object * @throws MissingIdException if the booking, owner or workspace id is null * @throws InstanceNotFoundException if the given user or workspace don't exist - * @author Daniil Zavyalov */ fun modelToEntity(bookingModel: Booking): WorkspaceBookingEntity { logger.trace("Converting booking model to entity") @@ -101,7 +99,6 @@ class BookingRepositoryConverter(private val database: Database, * @return the [UserEntity] for the given booking model * @throws MissingIdException if the user id is null * @throws InstanceNotFoundException if the given user don't exist - * @author Daniil Zavyalov */ private fun findOwnerEntity(ownerModel: UserModel): UserEntity { val ownerId: UUID = ownerModel.id @@ -118,7 +115,6 @@ class BookingRepositoryConverter(private val database: Database, * @return the [WorkspaceEntity] for the given booking model * @throws MissingIdException if the workspace id is null * @throws InstanceNotFoundException if the given workspace don't exist - * @author Daniil Zavyalov */ private fun findWorkspaceEntity(workspaceModel: Workspace): WorkspaceEntity { val workspaceId: UUID = workspaceModel.id diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/GoogleCalendarConverter.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/GoogleCalendarConverter.kt index 2a03b846e..4f4321313 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/GoogleCalendarConverter.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/GoogleCalendarConverter.kt @@ -77,7 +77,6 @@ class GoogleCalendarConverter( * * @param event * @return [UserModel] with data from database or [UserModel] placeholder - * @author Danil Kiselev, Max Mishenko, Daniil Zavyalov */ private fun getUserModel(event: Event): UserModel { val userId: UUID = try { @@ -145,7 +144,6 @@ class GoogleCalendarConverter( * @param workspace specify this parameter to reduce the number * of database queries if workspace have already been retrieved * @return The resulting [BookingDTO] object - * @author Danil Kiselev, Max Mishenko */ fun toMeetingWorkspaceBooking( event: Event, @@ -187,7 +185,6 @@ class GoogleCalendarConverter( * * @param email * @return [UserModel] with data from database or [UserModel] placeholder with the given [email] - * @author Danil Kiselev, Max Mishenko, Daniil Zavyalov */ private fun getUserModel(email: String?): UserModel? { if (email == null) { @@ -241,7 +238,6 @@ class GoogleCalendarConverter( * * @param calendarId Google id of calendar of workspace * @return [WorkspaceDTO] - * @author Danil Kiselev, Max Mishenko */ private fun getWorkspaceModel(calendarId: String?): Workspace { if (calendarId == null) { @@ -258,7 +254,6 @@ class GoogleCalendarConverter( * * @param model [Booking] to be converted * @return The resulting [Event] object - * @author Daniil Zavyalov */ fun toGoogleWorkspaceRegularEvent(model: Booking): Event { logger.debug("[toGoogleWorkspaceRegularEvent] converting regular workspace booking to calendar event") @@ -294,7 +289,6 @@ class GoogleCalendarConverter( * * @param model [Booking] to be converted * @return The resulting [Event] object - * @author Daniil Zavyalov */ fun toGoogleWorkspaceMeetingEvent(model: Booking): Event { logger.debug("[toGoogleWorkspaceMeetingEvent] converting meeting room booking to calendar event") @@ -388,7 +382,6 @@ class GoogleCalendarConverter( * Converts [UserModel] of owner to [Organizer] * * @return [Organizer] - * @author Danil Kiselev */ private fun userModelToGoogleOrganizer(model: UserModel?): Organizer { if (model == null) { @@ -404,7 +397,6 @@ class GoogleCalendarConverter( * * @param id workspace id. Should be valid UUID * @return calendar id by workspace id in database - * @author Danil Kiselev, Max Mishenko */ private fun getCalendarIdByWorkspaceId(id: String): String { return calendarIdsRepository.findByWorkspace(verifier.uuidFromString(id)) diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/RecurrenceConverter.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/RecurrenceConverter.kt index 800dfe6d0..6dc315dcb 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/RecurrenceConverter.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/RecurrenceConverter.kt @@ -19,7 +19,6 @@ object RecurrenceConverter { * * @param model [RecurrenceModel] to be converted * @return The resulting [RecurrenceDTO] object - * @author Max Mishenko */ fun modelToDto(model: RecurrenceModel): RecurrenceDTO { return RecurrenceDTO( @@ -39,7 +38,6 @@ object RecurrenceConverter { * * @param dto [RecurrenceDTO] to be converted * @return The resulting [RecurrenceModel] object - * @author Max Mishenko */ fun dtoToModel(dto: RecurrenceDTO): RecurrenceModel { if (dto.count != null && dto.until != null) diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/RecurrenceRuleFactory.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/RecurrenceRuleFactory.kt index b41c7e3ef..94d648a44 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/RecurrenceRuleFactory.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/converters/RecurrenceRuleFactory.kt @@ -6,14 +6,9 @@ import office.effective.model.Recurrence /** * Object for creating Google calendar recurrence rule - * - * @author Max Mishenko */ object RecurrenceRuleFactory { - /** - * @author Max Mishenko - */ fun String.getRecurrence(): Recurrence = trim('[', ']').substringAfter(":").split(";").fold( Recurrence( interval = 0, @@ -44,9 +39,6 @@ object RecurrenceRuleFactory { } } - /** - * @author Max Mishenko - */ fun Recurrence.rule() = "RRULE:".let { it + "FREQ=${freq.name};" }.let { if (interval != 0) it + "INTERVAL=${interval};" else it }.let { it + when (ending) { @@ -68,9 +60,7 @@ object RecurrenceRuleFactory { .trim(',') + ";" else it } - /** - * @author Max Mishenko - */ + private fun Int.toName(): String = when (this) { 1 -> "MO" 2 -> "TU" @@ -82,9 +72,7 @@ object RecurrenceRuleFactory { else -> "" } - /** - * @author Max Mishenko - */ + private fun String.toDayNum(): Int = when (this) { "MO" -> 1 "TU" -> 2 diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/facade/BookingFacade.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/facade/BookingFacade.kt index 742fed5da..6dc207d66 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/facade/BookingFacade.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/facade/BookingFacade.kt @@ -35,7 +35,6 @@ class BookingFacade( * Deletes the booking with the given id * * @param id booking id - * @author Daniil Zavyalov */ fun deleteById(id: String) { transactionManager.useTransaction({ @@ -49,7 +48,6 @@ class BookingFacade( * @param id id of requested booking * @return [BookingDTO] with the given id * @throws InstanceNotFoundException if booking with the given id doesn't exist in database - * @author Daniil Zavyalov */ fun findById(id: String): BookingDTO { val dto: BookingDTO = transactionManager.useTransaction({ @@ -70,7 +68,6 @@ class BookingFacade( * @param bookingRangeFrom lower bound (exclusive) for a endBooking to filter by. * Should be lover than [bookingRangeFrom]. Default value: [BookingConstants.MIN_SEARCH_START_TIME] * @return [BookingDTO] list - * @author Daniil Zavyalov */ fun findAll( userId: String?, @@ -100,7 +97,6 @@ class BookingFacade( * * @param bookingDTO [BookingDTO] to be saved * @return saved [BookingDTO] - * @author Daniil Zavyalov */ fun post(bookingDTO: BookingDTO): BookingDTO { val model = bookingConverter.dtoToModel(bookingDTO) @@ -117,7 +113,6 @@ class BookingFacade( * @param bookingDTO changed booking * @return [BookingDTO] after change saving * @throws BadRequestException if booking id is null - * @author Daniil Zavyalov */ fun put(bookingDTO: BookingDTO): BookingDTO { if (bookingDTO.id == null) throw BadRequestException("Missing booking id") diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/facade/BookingFacadeV1.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/facade/BookingFacadeV1.kt index 7dbf8c668..eac590938 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/facade/BookingFacadeV1.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/facade/BookingFacadeV1.kt @@ -29,7 +29,6 @@ class BookingFacadeV1( * Deletes the booking with the given id * * @param id booking id - * @author Daniil Zavyalov */ fun deleteById(id: String) { transactionManager.useTransaction({ @@ -43,7 +42,6 @@ class BookingFacadeV1( * @param id id of requested booking * @return [BookingResponseDTO] with the given id * @throws InstanceNotFoundException if booking with the given id doesn't exist in database - * @author Daniil Zavyalov */ fun findById(id: String): BookingResponseDTO { val dto: BookingResponseDTO = transactionManager.useTransaction({ @@ -65,7 +63,6 @@ class BookingFacadeV1( * Should be lover than [bookingRangeFrom]. Default value: [BookingConstants.MIN_SEARCH_START_TIME] * @param returnInstances return recurring bookings as non-recurrent instances * @return [BookingResponseDTO] list - * @author Daniil Zavyalov */ fun findAll( userId: String?, @@ -96,7 +93,6 @@ class BookingFacadeV1( * * @param bookingDTO [BookingRequestDTO] to be saved * @return saved [BookingResponseDTO] - * @author Daniil Zavyalov */ fun post(bookingDTO: BookingRequestDTO): BookingResponseDTO { val model = bookingConverter.requestDtoToModel(bookingDTO) @@ -113,7 +109,6 @@ class BookingFacadeV1( * @param bookingDTO changed booking * @param bookingId booking id * @return updated booking - * @author Daniil Zavyalov */ fun put(bookingDTO: BookingRequestDTO, bookingId: String): BookingResponseDTO { val model = bookingConverter.requestDtoToModel(bookingDTO, bookingId) diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingMeetingRepository.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingMeetingRepository.kt index 53296c018..e8b5b226e 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingMeetingRepository.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingMeetingRepository.kt @@ -195,7 +195,6 @@ class BookingMeetingRepository( * @param event * @param email * @return List of all user [Booking] - * @author Danil Kiselev, Daniil Zavyalov */ private fun checkEventOrganizer(event: Event, email: String): Boolean { if (event.organizer?.email == defaultCalendar) { @@ -211,7 +210,6 @@ class BookingMeetingRepository( * @param id * @return user email * @throws InstanceNotFoundException if user with the given id doesn't exist in database - * @author Danil Kiselev */ private fun findUserEmailByUserId(id: UUID): String { return userRepository.findById(id)?.email ?: throw InstanceNotFoundException( @@ -285,7 +283,6 @@ class BookingMeetingRepository( * @param returnInstances return recurring bookings as non-recurrent instances * @return List of all user [Booking] * @throws InstanceNotFoundException if user with the given id doesn't exist in database - * @author Daniil Zavyalov, Danil Kiselev */ override fun findAllByOwnerId( ownerId: UUID, diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingRegularRepository.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingRegularRepository.kt index 8d0d565e3..54a5605ff 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingRegularRepository.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingRegularRepository.kt @@ -33,7 +33,6 @@ class BookingRegularRepository( * * @param id booking id * @return true if booking exists - * @author Daniil Zavyalov */ override fun existsById(id: String): Boolean { logger.debug("[existsById] checking whether a booking with id={} exists", id) @@ -45,7 +44,6 @@ class BookingRegularRepository( * Deletes the booking with the given id * * @param id booking id - * @author Daniil Zavyalov */ override fun deleteById(id: String) { logger.debug("[deleteById] deleting the booking with id={}", id) @@ -64,7 +62,6 @@ class BookingRegularRepository( * * @param bookingId booking id * @return [Booking] with the given [bookingId] or null if booking with the given id doesn't exist - * @author Daniil Zavyalov */ override fun findById(bookingId: String): Booking? { logger.debug("[findById] retrieving a booking with id={}", bookingId) @@ -81,7 +78,6 @@ class BookingRegularRepository( * @param calendarId the calendar in which to search for the event * @return [Event] with the given [bookingId] from calendar with [calendarId] * or null if event with the given id doesn't exist - * @author Daniil Zavyalov */ private fun findByCalendarIdAndBookingId(bookingId: String, calendarId: String = regularWorkspacesCalendar): Event? { return try { @@ -100,7 +96,6 @@ class BookingRegularRepository( * @param timeMax * @param singleEvents * @param calendarId - * @author Daniil Zavyalov */ private fun basicQuery( timeMin: Long, @@ -123,7 +118,6 @@ class BookingRegularRepository( * @param eventRangeTo upper bound (exclusive) for a beginBooking to filter by. Optional. * @param returnInstances return recurring bookings as non-recurrent instances * @return List of all workspace [Booking] - * @author Daniil Zavyalov */ override fun findAllByWorkspaceId( workspaceId: UUID, @@ -158,7 +152,6 @@ class BookingRegularRepository( * @param returnInstances return recurring bookings as non-recurrent instances * @return List of all user [Booking] * @throws InstanceNotFoundException if user with the given id doesn't exist in database - * @author Daniil Zavyalov */ override fun findAllByOwnerId( ownerId: UUID, @@ -192,7 +185,6 @@ class BookingRegularRepository( * @param eventRangeTo upper bound (exclusive) for a beginBooking to filter by. Optional. * @param returnInstances return recurring bookings as non-recurrent instances * @return List of all [Booking]s with the given workspace and owner id - * @author Daniil Zavyalov */ override fun findAllByOwnerAndWorkspaceId( ownerId: UUID, @@ -226,7 +218,6 @@ class BookingRegularRepository( * @param eventRangeTo upper bound (exclusive) for a beginBooking to filter by. Optional. * @param returnInstances return recurring bookings as non-recurrent instances * @return All [Booking]s - * @author Daniil Zavyalov */ override fun findAll(eventRangeFrom: Long, eventRangeTo: Long?, returnInstances: Boolean): List { logger.debug( diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingRepository.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingRepository.kt index d507c64c9..d3dec88ba 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingRepository.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/BookingRepository.kt @@ -33,7 +33,6 @@ class BookingRepository(private val database: Database, * * @param id booking id * @return true if booking exists - * @author Daniil Zavyalov */ fun existsById(id: String): Boolean { return database.workspaceBooking.count { it.id eq uuidValidator.uuidFromString(id) } > 0 @@ -45,7 +44,6 @@ class BookingRepository(private val database: Database, * If the booking is not found in the database it is silently ignored * * @param id booking id - * @author Daniil Zavyalov */ fun deleteById(id: String) { val uuid = uuidValidator.uuidFromString(id) @@ -59,7 +57,6 @@ class BookingRepository(private val database: Database, * * @param bookingId booking id * @return [Booking] with the given [bookingId] or null if booking with the given id doesn't exist - * @author Daniil Zavyalov */ fun findById(bookingId: String): Booking? { val uuid = uuidValidator.uuidFromString(bookingId) @@ -73,7 +70,6 @@ class BookingRepository(private val database: Database, * * @param ownerId * @return List of all user [Booking] - * @author Daniil Zavyalov */ fun findAllByOwnerId(ownerId: UUID): List { val entityList = database.workspaceBooking.filter { it.ownerId eq ownerId }.toList() @@ -88,7 +84,6 @@ class BookingRepository(private val database: Database, * * @param workspaceId * @return List of all workspace [Booking] - * @author Daniil Zavyalov */ fun findAllByWorkspaceId(workspaceId: UUID): List { val entityList = database.workspaceBooking.filter { it.workspaceId eq workspaceId }.toList() @@ -104,7 +99,6 @@ class BookingRepository(private val database: Database, * @param ownerId * @param workspaceId * @return List of all [Booking]s with the given workspace and owner id - * @author Daniil Zavyalov */ fun findAllByOwnerAndWorkspaceId(ownerId: UUID, workspaceId: UUID): List { val entityList = database.workspaceBooking @@ -121,7 +115,6 @@ class BookingRepository(private val database: Database, * Retrieves all bookings * * @return All [Booking]s - * @author Daniil Zavyalov */ fun findAll(): List { val entityList = database.workspaceBooking.toList() @@ -136,7 +129,6 @@ class BookingRepository(private val database: Database, * * @param bookingId * @return booking participants - * @author Daniil Zavyalov */ private fun findParticipants(bookingId: UUID): List { return database @@ -152,7 +144,6 @@ class BookingRepository(private val database: Database, * * @param bookingEntity * @return true if workspace can be booked in period from [Booking.beginBooking] to [Booking.endBooking] - * @author Daniil Zavyalov */ private fun workspaceAvailableForBooking(bookingEntity: WorkspaceBookingEntity): Boolean { return database.workspaceBooking.none { @@ -167,7 +158,6 @@ class BookingRepository(private val database: Database, * @param booking [Booking] to be saved * @return saved [Booking] * @throws WorkspaceUnavailableException if workspace can't be booked in a given period - * @author Daniil Zavyalov */ fun save(booking: Booking): Booking { val id = UUID.randomUUID() @@ -195,7 +185,6 @@ class BookingRepository(private val database: Database, * * @param entity * @return true if workspace can be booked in period from [Booking.beginBooking] to [Booking.endBooking] - * @author Daniil Zavyalov */ private fun bookingCanBeUpdated(entity: WorkspaceBookingEntity): Boolean { return database.workspaceBooking.none { @@ -210,7 +199,6 @@ class BookingRepository(private val database: Database, * @return [Booking] after change saving * @throws InstanceNotFoundException if booking given id doesn't exist in the database * @throws WorkspaceUnavailableException if workspace can't be booked in a given period - * @author Daniil Zavyalov */ fun update(booking: Booking): Booking { booking.id?.let { @@ -237,7 +225,6 @@ class BookingRepository(private val database: Database, * * @param participantModels * @return actual participant entities - * @author Daniil Zavyalov */ private fun saveParticipants(participantModels: List, bookingId: UUID): List { val participantList = findParticipantEntities(participantModels) @@ -256,7 +243,6 @@ class BookingRepository(private val database: Database, * * @param participantModels * @return actual participant entities - * @author Daniil Zavyalov */ private fun findParticipantEntities(participantModels: List): List { val participantList = mutableListOf() diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/IBookingRepository.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/IBookingRepository.kt index ef25c390a..7f7abd70b 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/IBookingRepository.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/repository/IBookingRepository.kt @@ -13,7 +13,6 @@ interface IBookingRepository { * * @param id booking id * @return true if booking exists - * @author Daniil Zavyalov, Danil Kiselev */ fun existsById(id: String): Boolean @@ -21,7 +20,6 @@ interface IBookingRepository { * Deletes the booking with the given id * * @param id booking id - * @author Daniil Zavyalov, Danil Kiselev */ fun deleteById(id: String) @@ -31,7 +29,6 @@ interface IBookingRepository { * * @param bookingId booking id * @return [Booking] with the given [bookingId] or null if booking with the given id doesn't exist - * @author Daniil Zavyalov, Danil Kiselev */ fun findById(bookingId: String): Booking? @@ -44,7 +41,6 @@ interface IBookingRepository { * @param returnInstances return recurring bookings as non-recurrent instances * * @return List of all user [Booking] - * @author Daniil Zavyalov, Danil Kiselev */ fun findAllByOwnerId( ownerId: UUID, @@ -61,7 +57,6 @@ interface IBookingRepository { * @param eventRangeTo lover bound for filtering bookings by start time * @param returnInstances return recurring bookings as non-recurrent instances * @return List of all workspace [Booking] - * @author Daniil Zavyalov, Danil Kiselev */ fun findAllByWorkspaceId( workspaceId: UUID, @@ -79,7 +74,6 @@ interface IBookingRepository { * @param eventRangeTo lover bound for filtering bookings by start time * @param returnInstances return recurring bookings as non-recurrent instances * @return List of all [Booking]s with the given workspace and owner id - * @author Daniil Zavyalov, Danil Kiselev */ fun findAllByOwnerAndWorkspaceId( ownerId: UUID, @@ -96,7 +90,6 @@ interface IBookingRepository { * @param eventRangeTo lover bound for filtering bookings by start time * @param returnInstances return recurring bookings as non-recurrent instances * @return All [Booking]s - * @author Daniil Zavyalov, Danil Kiselev */ fun findAll(eventRangeFrom: Long, eventRangeTo: Long? = null, returnInstances: Boolean = true): List @@ -106,7 +99,6 @@ interface IBookingRepository { * * @param booking [Booking] to be saved * @return saved [Booking] - * @author Daniil Zavyalov, Danil Kiselev */ fun save(booking: Booking): Booking @@ -116,7 +108,6 @@ interface IBookingRepository { * @param booking changed booking * @return [Booking] after change saving * @throws InstanceNotFoundException if booking given id doesn't exist in the database - * @author Daniil Zavyalov, Danil Kiselev */ fun update(booking: Booking): Booking } \ No newline at end of file diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/service/BookingService.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/service/BookingService.kt index 50ab47336..3551a6c6f 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/service/BookingService.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/booking/service/BookingService.kt @@ -32,7 +32,6 @@ class BookingService( * * @param id booking id * @return true if booking exists - * @author Daniil Zavyalov */ override fun existsById(id: String): Boolean { return bookingMeetingRepository.existsById(id) || bookingRegularRepository.existsById(id) @@ -42,7 +41,6 @@ class BookingService( * Deletes the booking with the given id * * @param id booking id - * @author Daniil Zavyalov */ override fun deleteById(id: String) { bookingMeetingRepository.deleteById(id) @@ -54,7 +52,6 @@ class BookingService( * * @param id - booking id * @return [Booking] with the given [id] or null if workspace with the given id doesn't exist - * @author Daniil Zavyalov */ override fun findById(id: String): Booking? { val booking = bookingMeetingRepository.findById(id) @@ -87,7 +84,6 @@ class BookingService( * @param bookingRangeTo upper bound (exclusive) for a beginBooking to filter by. Optional. * @param bookingRangeFrom lower bound (exclusive) for a endBooking to filter by. * @throws InstanceNotFoundException if [UserModel] or [Workspace] with the given id doesn't exist in database - * @author Daniil Zavyalov */ override fun findAll( userId: UUID?, @@ -197,7 +193,6 @@ class BookingService( * @param bookingList bookings for which user integrations and workspace utilities need to be found and added. * @return bookings with user integrations and workspace utilities * @throws MissingIdException if user or workspace doesn't have an id - * @author Daniil Zavyalov */ private fun findIntegrationsAndUtilities(bookingList: List): List { val userIds = mutableSetOf() @@ -227,7 +222,6 @@ class BookingService( * @param bookingList bookings for which user integrations and workspace utilities need to be added. * @return bookings with user integrations and workspace utilities * @throws MissingIdException if user model doesn't have an id - * @author Daniil Zavyalov */ private fun addIntegrationsAndUtilities( bookingList: List, @@ -252,7 +246,6 @@ class BookingService( * @param user for which integrations need to be added * @return List of [IntegrationModel] for the given [UserModel] * @throws MissingIdException if user model doesn't have an id - * @author Daniil Zavyalov */ private fun findIntegrations(user: UserModel): Set { val userId = user.id ?: throw MissingIdException("User with name ${user.fullName} doesn't have an id") @@ -265,7 +258,6 @@ class BookingService( * @param workspace for which utilities need to be added * @return List of [Utility] for the given [Workspace] * @throws MissingIdException if workspace doesn't have an id - * @author Daniil Zavyalov */ private fun findUtilities(workspace: Workspace): List { val workspaceId = @@ -279,7 +271,6 @@ class BookingService( * @param booking [Booking] to be saved * @return saved [Booking] * @throws InstanceNotFoundException if workspace with the given id not found - * @author Daniil Zavyalov */ override fun save(booking: Booking): Booking { val workspaceId = booking.workspace.id ?: throw MissingIdException("Missing booking workspace id") @@ -303,7 +294,6 @@ class BookingService( * * @param booking changed booking * @return [Booking] after change saving - * @author Daniil Zavyalov */ override fun update(booking: Booking): Booking { return when (booking.workspace.tag) { diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/IntegrationDTOModelConverter.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/IntegrationDTOModelConverter.kt index 4ae3b60b5..1b0d3e2f5 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/IntegrationDTOModelConverter.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/IntegrationDTOModelConverter.kt @@ -15,8 +15,6 @@ class IntegrationDTOModelConverter( * Converts [IntegrationDTO] to [IntegrationModel] * @param integrationDTO [IntegrationDTO] input to convert to [IntegrationModel] * @return resulting [IntegrationModel] object - * - * @author Kiselev Danil * */ fun dTOToModel(integrationDTO: IntegrationDTO): IntegrationModel { return IntegrationModel(uuidConverter.uuidFromString(integrationDTO.id), integrationDTO.name, integrationDTO.value, "") @@ -26,8 +24,6 @@ class IntegrationDTOModelConverter( * Converts [IntegrationModel] to [IntegrationDTO] * @param integrationModel [IntegrationModel] input to convert to [IntegrationDTO] * @return resulting [IntegrationDTO] object - * - * @author Kiselev Danil * */ fun modelToDTO(integrationModel: IntegrationModel): IntegrationDTO { return IntegrationDTO(integrationModel.id.toString(), integrationModel.name, integrationModel.valueStr) diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/IntegrationModelEntityConverter.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/IntegrationModelEntityConverter.kt index 2db006904..852720869 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/IntegrationModelEntityConverter.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/IntegrationModelEntityConverter.kt @@ -11,8 +11,6 @@ class IntegrationModelEntityConverter { * Converts [IntegrationModel] to [IntegrationEntity] * @param integrationModel [IntegrationModel] input to convert to [IntegrationEntity] * @return resulting [IntegrationEntity] object - * - * @author Kiselev Danil * */ fun modelToEntity(integrationModel: IntegrationModel): IntegrationEntity { return IntegrationEntity { @@ -27,8 +25,6 @@ class IntegrationModelEntityConverter { * @param integrationEntity [IntegrationEntity] input to convert to [IntegrationModel] * @param valueStr [String] users_integrations value * @return resulting [IntegrationModel] object - * - * @author Kiselev Danil * */ fun entityToModel(integrationEntity: IntegrationEntity, valueStr: String): IntegrationModel { return IntegrationModel( diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/UserDTOModelConverter.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/UserDTOModelConverter.kt index 61772aca3..64c004bb8 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/UserDTOModelConverter.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/UserDTOModelConverter.kt @@ -22,8 +22,6 @@ class UserDTOModelConverter( * Converts [UserDTO] to [UserModel]. Search user tags in [UserRepository] by id. Takes user's integrations from DTO. * @param userDTO [UserDTO] to be converted * @return converted [UserModel] - * - * @author Danil Kiselev, Daniil Zavyalov */ fun dTOToModel(userDTO: UserDTO): UserModel { var userId: UUID? = null; @@ -55,8 +53,6 @@ class UserDTOModelConverter( * Converts [UserModel] to [UserDTO] * @param userModel [UserModel] to be converted * @return converted [UserDTO] - * - * @author Danil Kiselev, Daniil Zavyalov */ fun modelToDTO(userModel: UserModel): UserDTO { val integrations: MutableList = mutableListOf() diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/UserModelEntityConverter.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/UserModelEntityConverter.kt index c7bb47aaf..468a191e6 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/UserModelEntityConverter.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/converters/UserModelEntityConverter.kt @@ -16,8 +16,6 @@ class UserModelEntityConverter { * @throws MissingIdException if the user id is null * @param userModel [UserModel] to be converted * @return converted [UserEntity] - * - * @author Danil Kiselev, Daniil Zavyalov */ fun modelToEntity(userModel: UserModel): UserEntity { return UserEntity { @@ -37,8 +35,6 @@ class UserModelEntityConverter { * @param userEntity [UserEntity] to be converted * @param integrations [Set]<[IntegrationModel]>? to add into user model * @return converted [UserModel] - * - * @author Danil Kiselev, Daniil Zavyalov */ fun entityToModel(userEntity: UserEntity, integrations: Set?): UserModel { return UserModel( diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/facade/UserFacadeV1.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/facade/UserFacadeV1.kt index d80775b62..1f10dd464 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/facade/UserFacadeV1.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/facade/UserFacadeV1.kt @@ -21,7 +21,6 @@ class UserFacadeV1( * * @param tagStr name of the tag * @return [Set]<[UserDTO]> - * @author Kiselev Danil, Daniil Zavyalov * */ fun getUsersByTag(tagStr: String): Set { val models: Set = @@ -35,8 +34,6 @@ class UserFacadeV1( * Retrieves all users * @return [Set]<[UserDTO]> * @throws InstanceNotFoundException(UserModel::class, "User with id ${userIdStr} not found", null) - * - * @author Daniil Zavyalov * */ fun getUsers(): Set { return transactionManager.useTransaction({ @@ -54,7 +51,6 @@ class UserFacadeV1( * @param userIdStr string value of user id * @return [UserDTO] * @throws InstanceNotFoundException(UserModel::class, "User with id ${userIdStr} not found", null) - * @author Kiselev Danil * */ fun getUserById(userIdStr: String): UserDTO { return transactionManager.useTransaction({ @@ -72,7 +68,6 @@ class UserFacadeV1( * @param email user email * @return [UserDTO] * @throws InstanceNotFoundException(UserModel::class, "User with email $email not found", null) - * @author Kiselev Danil, Daniil Zavyalov * */ fun getUserByEmail(email: String): UserDTO { return transactionManager.useTransaction({ @@ -89,8 +84,6 @@ class UserFacadeV1( * * @param user [UserDTO] - user dto with changed information * @return [UserDTO] - updated user - * - * @author Danil Kiselev, Daniil Zavyalov */ fun updateUser(user: UserDTO): UserDTO { return transactionManager.useTransaction({ diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/repository/UserRepository.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/repository/UserRepository.kt index dc35d9bd9..f0b48f108 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/repository/UserRepository.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/repository/UserRepository.kt @@ -28,7 +28,6 @@ class UserRepository( * * @return [Boolean] (true - exists) * @param userId user id in [UUID] format - * @author Danil Kiselev * */ fun existsById(userId: UUID): Boolean { logger.debug("[existsById] checking whether a user with id={} exists", userId.toString()) @@ -40,7 +39,6 @@ class UserRepository( * * @return [UserModel] if user exists * @param userId user id in [UUID] format - * @author Danil Kiselev, Daniil Zavyalov * */ fun findById(userId: UUID): UserModel? { logger.debug("[findById] retrieving a user with id={}", userId.toString()) @@ -54,8 +52,6 @@ class UserRepository( /** * Retrieves all users * @return [Set]<[UserModel]> - * - * @author Daniil Zavyalov * */ fun findAll(): Set { logger.debug("[findAll] retrieving all users") @@ -79,8 +75,6 @@ class UserRepository( /** * Used to find multiple users with one tag * @return [Set]<[UserModel]> - users with tag name like input - * - * @author Danil Kiselev, Daniil Zavyalov * */ fun findByTag(tagId: UUID): Set { logger.debug("[findByTag] retrieving users with tag with id={}", tagId.toString()) @@ -100,7 +94,6 @@ class UserRepository( * * @return [UserModel] * @throws InstanceNotFoundException if user with the given email doesn't exist in database - * @author Daniil Zavyalov */ fun findByEmail(email: String): UserModel? { logger.debug("[findByEmail] retrieving a user with email {}", email) @@ -119,7 +112,6 @@ class UserRepository( * If a user with one of the specified emails does not exist, that email will be ignored. * * @return users with integrations - * @author Daniil Zavyalov */ fun findAllByEmails(emails: Collection): List { logger.debug("[findAllByEmails] retrieving users with emails {}", emails.joinToString()) @@ -141,8 +133,6 @@ class UserRepository( * Returns Integration entity by id * @return [IntegrationEntity] * @throws InstanceNotFoundException([IntegrationEntity], "Integration with id ${id} not found") - * - * @author Danil Kiselev * */ private fun findIntegrationById(id: UUID): IntegrationEntity { logger.trace("[findIntegrationById] retrieving integrations for user with id={}", id.toString()) @@ -156,7 +146,6 @@ class UserRepository( * @return [MutableSet]<[IntegrationModel]> * @throws InstanceNotFoundException([UserEntity]::class, "User $userId") * @param userId user id in [UUID] format - * @author Danil Kiselev, Daniil Zavyalov * */ fun findSetOfIntegrationsByUser(userId: UUID): MutableSet { logger.trace("[findSetOfIntegrationsByUser] retrieving integrations for user with id={}", userId) @@ -186,7 +175,6 @@ class UserRepository( * @return [HashMap]<[UUID], [MutableSet]<[IntegrationModel]>> * @throws InstanceNotFoundException if user with the given id doesn't exist in the database * @param ids [Collection]<[UUID]> of users id - * @author Daniil Zavyalov, Danil Kiselev * */ fun findAllIntegrationsByUserIds(ids: Collection): HashMap> { logger.debug( @@ -219,7 +207,6 @@ class UserRepository( * @return [UserTagModel] * @throws InstanceNotFoundException([UsersTagEntity]::class, "Tag with name ${tagName} not found") * @param tagName name of the tag - * @author Danil Kiselev * */ fun findTagByName(tagName: String): UserTagModel { logger.debug("[findTagByName] retrieving users with tag {}", tagName) @@ -235,8 +222,6 @@ class UserRepository( * @throws MissingIdException if the user or integration id is null * @throws InstanceNotFoundException if the given user or integration don't exist * @param model [UserModel] with updated information - * - * @author Danil Kiselev, Daniil Zavyalov */ fun updateUser(model: UserModel): UserModel { logger.debug("[updateUser] updating user with id {}", model.id) @@ -268,8 +253,6 @@ class UserRepository( * @param integrationModels [Set]<[IntegrationModel]> set of integrations to save * @param userId user id in [UUID] format * @throws InstanceNotFoundException if the given integration don't exist - * - * @author Daniil Zavyalov, Danil Kiselev */ private fun saveIntegrations(integrationModels: Set, userId: UUID) { logger.trace("[saveIntegrations] saving set of integrations for user with id={}", userId) @@ -293,7 +276,6 @@ class UserRepository( * Returns Tag entity or null, if user with such id doesn't exist * @return UsersTagEntity? * @param userId user id in [UUID] format - * @author Danil Kiselev * */ fun findTagByUserOrNull(userId: UUID): UsersTagEntity? { logger.debug("[findTagByUserOrNull] retrieving tag for user with id={}", userId) diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/service/UserService.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/service/UserService.kt index 957f29095..f5418e0f6 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/service/UserService.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/user/service/UserService.kt @@ -17,8 +17,6 @@ class UserService(private val repository: UserRepository) : IUserService { /** * Retrieves all users * @return [Set]<[UserModel]> - * - * @author Daniil Zavyalov * */ override fun getAll(): Set { return repository.findAll() @@ -33,7 +31,6 @@ class UserService(private val repository: UserRepository) : IUserService { * * @param user User's model * @return [UserModel] - * @author Kiselev Danil */ override fun updateUser(user: UserModel): UserModel { return repository.updateUser(user) @@ -44,7 +41,6 @@ class UserService(private val repository: UserRepository) : IUserService { * * @param emailStr user email * @return [UserModel] - * @author Kiselev Danil * */ override fun getUserByEmail(emailStr: String): UserModel? { return repository.findByEmail(emailStr) diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/converters/WorkspaceDtoModelConverter.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/converters/WorkspaceDtoModelConverter.kt index c53cf73bd..1f1e7a1bb 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/converters/WorkspaceDtoModelConverter.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/converters/WorkspaceDtoModelConverter.kt @@ -21,7 +21,6 @@ class WorkspaceDtoModelConverter(private val uuidValidator: UuidValidator) { * @param model The [Workspace] object to be converted * @param bookings bookings of this workspace * @return The resulting [WorkspaceDTO] object - * @author Daniil Zavyalov */ fun modelToDto(model: Workspace, bookings: List? = null): WorkspaceDTO { val utilities = model.utilities.map { utilityModelToDto(it) } @@ -40,7 +39,6 @@ class WorkspaceDtoModelConverter(private val uuidValidator: UuidValidator) { * to [WorkspaceDTO] with [WorkspaceZoneDTO] and [UtilityDTO]s * @param model The [Workspace] object to be converted * @return The resulting [WorkspaceDTO] object - * @author Daniil Zavyalov */ @Deprecated( message = "Deprecated since 1.0 api version", @@ -62,7 +60,6 @@ class WorkspaceDtoModelConverter(private val uuidValidator: UuidValidator) { * * @param model The [Utility] object to be converted * @return The resulting [UtilityDTO] object - * @author Daniil Zavyalov */ private fun utilityModelToDto(model: Utility): UtilityDTO { return UtilityDTO(model.id.toString(), model.name, model.iconUrl, model.count) @@ -73,7 +70,6 @@ class WorkspaceDtoModelConverter(private val uuidValidator: UuidValidator) { * * @param model The [WorkspaceZone] object to be converted * @return The resulting [WorkspaceZoneDTO] object - * @author Daniil Zavyalov */ fun zoneModelToDto(model: WorkspaceZone): WorkspaceZoneDTO { return WorkspaceZoneDTO(model.id.toString(), model.name) @@ -85,7 +81,6 @@ class WorkspaceDtoModelConverter(private val uuidValidator: UuidValidator) { * Uses [UuidValidator] to convert workspace id to UUID, but if [WorkspaceDTO.id]=="null" [Workspace.id] will be null * @param dto The WorkspaceDTO object to be converted * @return The resulting Workspace object - * @author Daniil Zavyalov, Danil Kiselev */ fun dtoToModel(dto: WorkspaceDTO): Workspace { var workspaceId: UUID? = null @@ -109,7 +104,6 @@ class WorkspaceDtoModelConverter(private val uuidValidator: UuidValidator) { * Uses [UuidValidator] to convert workspace id to UUID, but if [WorkspaceResponseDTO.id]=="null" [Workspace.id] will be null * @param dto The WorkspaceDTO object to be converted * @return The resulting Workspace object - * @author Daniil Zavyalov, Danil Kiselev */ @Deprecated( message = "Deprecated since 1.0 api version", @@ -136,7 +130,6 @@ class WorkspaceDtoModelConverter(private val uuidValidator: UuidValidator) { * * @param dto The [UtilityDTO] object to be converted * @return The resulting [Utility] object - * @author Daniil Zavyalov */ private fun utilityDtoToModel(dto: UtilityDTO): Utility { return Utility(uuidValidator.uuidFromString(dto.id), dto.name, dto.iconUrl, dto.count) @@ -147,7 +140,6 @@ class WorkspaceDtoModelConverter(private val uuidValidator: UuidValidator) { * * @param dto The [WorkspaceZoneDTO] object to be converted * @return The resulting [WorkspaceZone] object - * @author Daniil Zavyalov */ private fun zoneDtoToModel(dto: WorkspaceZoneDTO): WorkspaceZone { return WorkspaceZone(uuidValidator.uuidFromString(dto.id), dto.name) diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/converters/WorkspaceRepositoryConverter.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/converters/WorkspaceRepositoryConverter.kt index 7b9cd3b35..c458b6f2d 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/converters/WorkspaceRepositoryConverter.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/converters/WorkspaceRepositoryConverter.kt @@ -28,7 +28,6 @@ class WorkspaceRepositoryConverter(private val database: Database) { * @param entity The [WorkspaceEntity] object to be converted * @param utilities [Utilities][Utility] for [Workspace] * @return The resulting [Workspace] object - * @author Daniil Zavyalov */ fun entityToModel(entity: WorkspaceEntity, utilities: List): Workspace { return Workspace( @@ -46,7 +45,6 @@ class WorkspaceRepositoryConverter(private val database: Database) { * @param entity The [WorkspaceEntity] object to be converted * @param count The number of this utility in the workspace * @return The resulting [Utility] object - * @author Daniil Zavyalov */ fun utilityEntityToModel(entity: UtilityEntity, count: Int): Utility { return Utility(entity.id, entity.name, entity.iconUrl, count) @@ -57,7 +55,6 @@ class WorkspaceRepositoryConverter(private val database: Database) { * * @param zoneEntity The [WorkspaceZoneEntity] object to be converted * @return The resulting [WorkspaceZone] object - * @author Daniil Zavyalov */ fun zoneEntityToModel(zoneEntity: WorkspaceZoneEntity): WorkspaceZone { return WorkspaceZone(zoneEntity.id, zoneEntity.name) @@ -68,8 +65,6 @@ class WorkspaceRepositoryConverter(private val database: Database) { * Use database connection to find [WorkspaceTagEntity] by [Workspace.tag] * * @throws InstanceNotFoundException if tag doesn't exist in the database - * - * @author Daniil Zavyalov */ fun modelToEntity(model: Workspace): WorkspaceEntity { val tagEntity: WorkspaceTagEntity = database.workspaceTags.find { it.name eq model.tag } @@ -91,7 +86,6 @@ class WorkspaceRepositoryConverter(private val database: Database) { * * @param zoneModel The [WorkspaceZone] object to be converted * @return The resulting [WorkspaceZoneEntity] object - * @author Daniil Zavyalov */ fun zoneModelToEntity(zoneModel: WorkspaceZone): WorkspaceZoneEntity { return WorkspaceZoneEntity { diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/facade/WorkspaceFacade.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/facade/WorkspaceFacade.kt index 651235908..fa5e4da62 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/facade/WorkspaceFacade.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/facade/WorkspaceFacade.kt @@ -36,7 +36,6 @@ class WorkspaceFacade(private val service: IWorkspaceService, * @param id id of requested workspace. Should be valid UUID * @return [WorkspaceResponseDTO] with the given [id] * @throws InstanceNotFoundException if workspace with the given id doesn't exist in database - * @author Daniil Zavyalov */ fun findById(id: String): WorkspaceResponseDTO { val uuid = uuidValidator.uuidFromString(id) @@ -55,7 +54,6 @@ class WorkspaceFacade(private val service: IWorkspaceService, * * @param tag tag name of requested workspaces * @return List of [WorkspaceResponseDTO] with the given [tag] - * @author Daniil Zavyalov */ fun findAllByTag(tag: String): List { val result = transactionManager.useTransaction({ @@ -74,7 +72,6 @@ class WorkspaceFacade(private val service: IWorkspaceService, * @return List of [WorkspaceResponseDTO] with the given [tag] * @throws ValidationException if begin or end timestamp less than 0, greater than max timestamp * or if end timestamp less than or equal to begin timestamp - * @author Daniil Zavyalov */ fun findAllFreeByPeriod(tag: String, beginTimestamp: Long, endTimestamp: Long): List { if (beginTimestamp < 0L || beginTimestamp >= 2147483647000L) @@ -99,7 +96,6 @@ class WorkspaceFacade(private val service: IWorkspaceService, * Returns all workspace zones * * @return List of all [WorkspaceZoneDTO] - * @author Daniil Zavyalov */ fun findAllZones(): List { return transactionManager.useTransaction({ diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/facade/WorkspaceFacadeV1.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/facade/WorkspaceFacadeV1.kt index 2a105f80d..e26073515 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/facade/WorkspaceFacadeV1.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/facade/WorkspaceFacadeV1.kt @@ -32,7 +32,6 @@ class WorkspaceFacadeV1( * @param id id of requested workspace. Should be valid UUID * @return [WorkspaceDTO] with the given [id] * @throws InstanceNotFoundException if workspace with the given id doesn't exist in database - * @author Daniil Zavyalov */ fun findById(id: String): WorkspaceDTO { val uuid = uuidValidator.uuidFromString(id) @@ -53,7 +52,6 @@ class WorkspaceFacadeV1( * @param withBookingsFrom lower bound (exclusive) for a booking.endBooking to filter by. * @param withBookingsUntil upper bound (exclusive) for a booking.beginBooking to filter by. * @return List of [WorkspaceDTO] with their bookings - * @author Daniil Zavyalov */ fun findAllByTag( tag: String, @@ -90,7 +88,6 @@ class WorkspaceFacadeV1( * * @param tag tag name of requested workspaces * @return List of [Workspace] with the given [tag] - * @author Daniil Zavyalov */ private fun findAllByTag(tag: String): List { return transactionManager.useTransaction({ @@ -107,7 +104,6 @@ class WorkspaceFacadeV1( * @return List of [WorkspaceDTO] with the given [tag] * @throws ValidationException if begin or end timestamp less than 0, greater than max timestamp * or if end timestamp less than or equal to begin timestamp - * @author Daniil Zavyalov */ fun findAllFreeByPeriod(tag: String, beginTimestamp: Long, endTimestamp: Long): List { if (beginTimestamp < 0L) @@ -132,7 +128,6 @@ class WorkspaceFacadeV1( * Returns all workspace zones * * @return List of all [WorkspaceZoneDTO] - * @author Daniil Zavyalov */ fun findAllZones(): List { return transactionManager.useTransaction({ diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/repository/WorkspaceRepository.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/repository/WorkspaceRepository.kt index 27f14f4fc..f8b99565b 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/repository/WorkspaceRepository.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/repository/WorkspaceRepository.kt @@ -32,7 +32,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * TODO: existence check temporary always returns true * @param workspaceId id of requested workspace * @return true if [Workspace] with the given [workspaceId] exists in the database - * @author Daniil Zavyalov */ fun workspaceExistsById(workspaceId: UUID): Boolean { logger.debug("[workspaceExistsById] checking whether a workspace with id={} exists", workspaceId) @@ -44,7 +43,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * * @param utilityId id of requested utility * @return true if [Utility] with the given [utilityId] exists in the database - * @author Daniil Zavyalov */ fun utilityExistsById(utilityId: UUID): Boolean { logger.debug("[utilityExistsById] checking whether a utility with id={} exists", utilityId) @@ -57,7 +55,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * @param workspaceId * @return List of [Utility] for [Workspace] with the given id * @throws InstanceNotFoundException if workspace with given id doesn't exist in the database - * @author Daniil Zavyalov */ fun findUtilitiesByWorkspaceId(workspaceId: UUID): List { logger.debug( @@ -77,7 +74,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * * @param workspaceId * @return List of [Utility] for [Workspace] with the given id - * @author Daniil Zavyalov */ private fun findUtilityModels(workspaceId: UUID): List { logger.trace( @@ -100,8 +96,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * * @return Returns a HashMap that maps user ids and lists with their integrations * @throws InstanceNotFoundException if user with the given id doesn't exist in the database - * - * @author Daniil Zavyalov * */ fun findAllUtilitiesByWorkspaceIds(ids: Collection): HashMap> { logger.debug( @@ -138,7 +132,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * * @param workspaceId id of requested workspace * @return [Workspace] with the given [workspaceId] or null if workspace with the given id doesn't exist - * @author Daniil Zavyalov */ fun findById(workspaceId: UUID): Workspace? { logger.debug("[findById] retrieving a workspace with id={}", workspaceId) @@ -153,7 +146,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * @param tag tag name of requested workspaces * @return List of [Workspace] with the given [tag] * @throws InstanceNotFoundException if tag doesn't exist in the database - * @author Daniil Zavyalov */ fun findAllByTag(tag: String): List { logger.debug("[findAllByTag] retrieving workspaces with tag {}", tag) @@ -177,7 +169,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * @param endTimestamp period end time * @return List of [Workspace] with the given [tag] * @throws InstanceNotFoundException if tag doesn't exist in the database - * @author Daniil Zavyalov */ fun findAllFreeByPeriod(tag: String, beginTimestamp: Instant, endTimestamp: Instant): List { logger.debug( @@ -202,7 +193,6 @@ class WorkspaceRepository(private val database: Database, private val converter: } /** - * @author Danil Kiselev * @return workspace id of the given bookings * */ private fun findAllWorkspacesIdFromBookings(bookings: List): List { @@ -219,7 +209,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * Returns all workspace zones * * @return List of all [WorkspaceZone] - * @author Daniil Zavyalov */ fun findAllZones(): List { logger.debug("[findAllZones] retrieving all workspace zones") @@ -234,7 +223,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * @param workspaceId * @param count quantity of the given utility in the workspace * @throws InstanceNotFoundException if workspace or utility with given id doesn't exist in the database - * @author Daniil Zavyalov */ @Deprecated("API does not involve adding utility to workspaces") fun addUtilityToWorkspace(utilityId: UUID, workspaceId: UUID, count: UInt) { @@ -261,7 +249,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * * @param workspace [Workspace] to be saved * @return saved [Workspace] - * @author Daniil Zavyalov */ @Deprecated("API does not involve saving workspace entities") fun save(workspace: Workspace): Workspace { @@ -279,7 +266,6 @@ class WorkspaceRepository(private val database: Database, private val converter: * If the workspace is not found in the database it is silently ignored * * @param workspaceId - * @author Daniil Zavyalov */ @Deprecated("API does not involve deleting workspace entities") fun deleteById(workspaceId: UUID) { diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/service/WorkspaceService.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/service/WorkspaceService.kt index c97896865..2db5e5c4f 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/service/WorkspaceService.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/features/workspace/service/WorkspaceService.kt @@ -17,7 +17,6 @@ class WorkspaceService(private val workspaceRepository: WorkspaceRepository): IW * * @param id id of requested workspace * @return [Workspace] with the given [id] or null if workspace with the given id doesn't exist - * @author Daniil Zavyalov */ override fun findById(id: UUID): Workspace? { return workspaceRepository.findById(id) @@ -28,7 +27,6 @@ class WorkspaceService(private val workspaceRepository: WorkspaceRepository): IW * * @param tag tag name of requested workspaces * @return List of [Workspace] with the given [tag] - * @author Daniil Zavyalov */ override fun findAllByTag(tag: String): List { return workspaceRepository.findAllByTag(tag) @@ -41,7 +39,6 @@ class WorkspaceService(private val workspaceRepository: WorkspaceRepository): IW * @param beginTimestamp period start time * @param endTimestamp period end time * @return List of [Workspace] with the given [tag] - * @author Daniil Zavyalov */ override fun findAllFreeByPeriod(tag: String, beginTimestamp: Instant, endTimestamp: Instant): List { return workspaceRepository.findAllFreeByPeriod(tag, beginTimestamp, endTimestamp) @@ -51,7 +48,6 @@ class WorkspaceService(private val workspaceRepository: WorkspaceRepository): IW * Returns all workspace zones * * @return List of all [WorkspaceZone] - * @author Daniil Zavyalov */ override fun findAllZones(): List { return workspaceRepository.findAllZones() diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/model/Recurrence.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/model/Recurrence.kt index 943e5ae66..9ab6c30db 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/model/Recurrence.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/model/Recurrence.kt @@ -46,7 +46,6 @@ data class Recurrence( * * @param millisDate - date in milliseconds ([Long]) * @return [String] - date in DATE-TIME (RFC5545). Example: [BookingConstants.UNTIL_FORMAT] - * @author Kiselev Danil * */ private fun toDateRfc5545(millisDate: Long): String { val time = GregorianCalendar().apply { timeInMillis = millisDate + 86400000 } diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/plugins/Migration.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/plugins/Migration.kt index f4fc81c69..5e5956b2f 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/plugins/Migration.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/plugins/Migration.kt @@ -10,8 +10,6 @@ import java.sql.DriverManager /** * Run database migrations at application startup if MIGRATIONS_ENABLE is true - * - * @author Daniil Zavyalov */ fun Application.configureMigration() { val host: String? = System.getenv("DATABASE_HOST") diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IBookingService.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IBookingService.kt index b6e367dc4..6ddab7efa 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IBookingService.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IBookingService.kt @@ -14,7 +14,6 @@ interface IBookingService { * * @param id booking id * @return true if booking exists - * @author Daniil Zavyalov */ fun existsById(id: String): Boolean @@ -22,7 +21,6 @@ interface IBookingService { * Deletes the booking with the given id * * @param id booking id - * @author Daniil Zavyalov */ fun deleteById(id: String) @@ -31,7 +29,6 @@ interface IBookingService { * * @param id - booking id * @return [Booking] with the given [id] or null if workspace with the given id doesn't exist - * @author Daniil Zavyalov */ fun findById(id: String): Booking? @@ -44,7 +41,6 @@ interface IBookingService { * @param bookingRangeTo upper bound (exclusive) for a beginBooking to filter by. Optional. * @param bookingRangeFrom lower bound (exclusive) for a endBooking to filter by. * @throws InstanceNotFoundException if [UserModel] or [Workspace] with the given id doesn't exist in database - * @author Daniil Zavyalov */ fun findAll( userId: UUID? = null, @@ -59,7 +55,6 @@ interface IBookingService { * * @param booking [Booking] to be saved * @return saved [Booking] - * @author Daniil Zavyalov */ fun save(booking: Booking): Booking @@ -68,7 +63,6 @@ interface IBookingService { * * @param booking changed booking * @return [Booking] after change saving - * @author Daniil Zavyalov */ fun update(booking: Booking): Booking } diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IUserService.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IUserService.kt index 1547f5e26..7cbaf2c6b 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IUserService.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IUserService.kt @@ -12,7 +12,6 @@ interface IUserService { * * @param tagStr name of the tag * @return Set - * @author Kiselev Danil * */ fun getUsersByTag(tagStr: String): Set; @@ -20,7 +19,6 @@ interface IUserService { * Return all users in database * * @return Set - * @author Daniil Zavyalov * */ fun getAll(): Set @@ -29,7 +27,6 @@ interface IUserService { * * @param userIdStr string value of user id * @return UserModel or null - * @author Kiselev Danil * */ fun getUserById(userIdStr: String): UserModel?; @@ -38,7 +35,6 @@ interface IUserService { * * @param user User's model * @return UserModel - * @author Kiselev Danil * */ fun updateUser(user: UserModel): UserModel; @@ -47,7 +43,6 @@ interface IUserService { * * @param emailStr user email * @return UserModel - * @author Kiselev Danil * */ fun getUserByEmail(emailStr: String): UserModel?; } \ No newline at end of file diff --git a/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IWorkspaceService.kt b/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IWorkspaceService.kt index 49e6c7d97..6e713830f 100644 --- a/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IWorkspaceService.kt +++ b/effectiveOfficeBackend/src/main/kotlin/office/effective/serviceapi/IWorkspaceService.kt @@ -15,7 +15,6 @@ interface IWorkspaceService { * * @param id id of requested workspace * @return [Workspace] with the given [id] or null if workspace with the given id doesn't exist - * @author Daniil Zavyalov */ fun findById(id: UUID): Workspace? @@ -24,7 +23,6 @@ interface IWorkspaceService { * * @param tag tag name of requested workspaces * @return List of [Workspace] with the given [tag] - * @author Daniil Zavyalov */ fun findAllByTag(tag: String): List @@ -35,7 +33,6 @@ interface IWorkspaceService { * @param beginTimestamp period start time * @param endTimestamp period end time * @return List of [Workspace] with the given [tag] - * @author Daniil Zavyalov */ fun findAllFreeByPeriod(tag: String, beginTimestamp: Instant, endTimestamp: Instant): List @@ -43,7 +40,6 @@ interface IWorkspaceService { * Returns all workspace zones * * @return List of all [WorkspaceZone] - * @author Daniil Zavyalov */ fun findAllZones(): List } \ No newline at end of file