Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(backend): add error handler to NATS functions #37

Merged
merged 3 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
feat(jobs): add error handler to functions
  • Loading branch information
Kuruyia committed Dec 13, 2023
commit 4affcbdf0e1b9fb410f8e03058694f5c609c9746
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.linkedout.jobs.function.companies

import com.linkedout.common.utils.RequestResponseFactory
import com.linkedout.common.utils.handleRequestError
import com.linkedout.jobs.service.CompanyService
import com.linkedout.proto.RequestOuterClass.Request
import com.linkedout.proto.ResponseOuterClass.Response
Expand All @@ -11,9 +12,9 @@ import java.util.function.Function

@Component
class GetCompanies(private val companyService: CompanyService) : Function<Request, Response> {
override fun apply(t: Request): Response {
override fun apply(t: Request): Response = handleRequestError {
// Get the companies from the database
val responseMono = companyService.findAll()
val reactiveResponse = companyService.findAll()
.map { company ->
CompanyOuterClass.Company.newBuilder()
.setId(company.id.toString())
Expand All @@ -26,12 +27,9 @@ class GetCompanies(private val companyService: CompanyService) : Function<Reques
.map { builder ->
builder.build()
}

// Block until the response is ready
val response = try {
responseMono.block()
} catch (e: Exception) {
return RequestResponseFactory.newFailedResponse(e.message ?: "Unknown error").build()
}
val response = reactiveResponse.block()
?: return RequestResponseFactory.newSuccessfulResponse()
.setGetCompaniesResponse(Jobs.GetCompaniesResponse.getDefaultInstance())
.build()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.linkedout.jobs.function.companies

import com.linkedout.common.utils.RequestResponseFactory
import com.linkedout.common.utils.handleRequestError
import com.linkedout.jobs.service.CompanyService
import com.linkedout.proto.RequestOuterClass.Request
import com.linkedout.proto.ResponseOuterClass.Response
Expand All @@ -13,9 +14,9 @@ import java.util.function.Function

@Component
class GetCompany(private val companyService: CompanyService) : Function<Request, Response> {
override fun apply(t: Request): Response {
override fun apply(t: Request): Response = handleRequestError {
// Get the company from the database
val responseMono = companyService.findOne(UUID.fromString(t.getCompanyRequest.id))
val reactiveResponse = companyService.findOne(UUID.fromString(t.getCompanyRequest.id))
.map { company ->
CompanyOuterClass.Company.newBuilder()
.setId(company.id.toString())
Expand All @@ -28,11 +29,7 @@ class GetCompany(private val companyService: CompanyService) : Function<Request,
.build()
}
// Block until the response is ready
val response = try {
responseMono.block()
} catch (e: Exception) {
return RequestResponseFactory.newFailedResponse(e.message ?: "Unknown error").build()
}
val response = reactiveResponse.block()
?: return RequestResponseFactory.newFailedResponse("Company not found", HttpStatus.NOT_FOUND).build()

return RequestResponseFactory.newSuccessfulResponse()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.linkedout.jobs.function.jobOffers

import com.linkedout.common.utils.RequestResponseFactory
import com.linkedout.common.utils.handleRequestError
import com.linkedout.jobs.service.JobOfferService
import com.linkedout.proto.RequestOuterClass.Request
import com.linkedout.proto.ResponseOuterClass.Response
Expand All @@ -15,9 +16,9 @@ import java.util.function.Function

@Component
class GetJobOffer(private val jobOfferService: JobOfferService) : Function<Request, Response> {
override fun apply(t: Request): Response {
override fun apply(t: Request): Response = handleRequestError {
// Get the job offer from the database
val responseMono = jobOfferService.findOne(UUID.fromString(t.getJobOfferRequest.id))
val reactiveResponse = jobOfferService.findOne(UUID.fromString(t.getJobOfferRequest.id))
.map { jobOffer ->
JobOfferOuterClass.JobOffer.newBuilder()
.setId(jobOffer.jobOfferId)
Expand Down Expand Up @@ -48,11 +49,7 @@ class GetJobOffer(private val jobOfferService: JobOfferService) : Function<Reque
}

// Block until the response is ready
val response = try {
responseMono.block()
} catch (e: Exception) {
return RequestResponseFactory.newFailedResponse(e.message ?: "Unknown error").build()
}
val response = reactiveResponse.block()
?: return RequestResponseFactory.newFailedResponse("Job offer not found", HttpStatus.NOT_FOUND).build()

return RequestResponseFactory.newSuccessfulResponse()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.linkedout.jobs.function.jobOffers

import com.linkedout.common.utils.RequestResponseFactory
import com.linkedout.common.utils.handleRequestError
import com.linkedout.jobs.service.JobOfferService
import com.linkedout.jobs.service.JobService
import com.linkedout.proto.RequestOuterClass.Request
import com.linkedout.proto.ResponseOuterClass.Response
import com.linkedout.proto.models.CompanyOuterClass
Expand All @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component
import java.util.function.Function

@Component
class GetJobOffers(private val jobOfferService: JobOfferService, private val jobService: JobService) : Function<Request, Response> {
override fun apply(t: Request): Response {
class GetJobOffers(private val jobOfferService: JobOfferService) : Function<Request, Response> {
override fun apply(t: Request): Response = handleRequestError {
// Get all the job offers from the database
val responseMono = jobOfferService.findAll()
val reactiveResponse = jobOfferService.findAll()
.map { jobOffer ->
JobOfferOuterClass.JobOffer.newBuilder()
.setId(jobOffer.jobOfferId)
Expand Down Expand Up @@ -50,11 +50,7 @@ class GetJobOffers(private val jobOfferService: JobOfferService, private val job
}

// Block until the response is ready
val response = try {
responseMono.block()
} catch (e: Exception) {
return RequestResponseFactory.newFailedResponse(e.message ?: "Unknown error").build()
}
val response = reactiveResponse.block()
?: return RequestResponseFactory.newSuccessfulResponse()
.setGetJobOffersResponse(Jobs.GetJobOffersResponse.getDefaultInstance())
.build()
Expand Down