diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md deleted file mode 100644 index 663ba7ef..00000000 --- a/.github/ISSUE_TEMPLATE/bug.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -name: Bug Report -about: Report a problem with the app -title: [BUG] ---- - -**Description** -Briefly describe the bug. - -**Steps to Reproduce** - -1. Go to '...' -2. Click on '...' -3. Observe the issue. - -**Expected vs. Actual Behavior** - -- **Expected:** What should happen? -- **Actual:** What happens instead? - -**Environment** - -- **Platform:** (e.g., Windows, macOS, Linux, iOS, Android) -- **Browser:** (e.g., Chrome, Firefox, Safari) -- **Version:** (if applicable) - -**Additional Context** -Any screenshots, logs, or error messages? Add them here. diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md deleted file mode 100644 index ae186514..00000000 --- a/.github/ISSUE_TEMPLATE/feature.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Feature Request -about: Suggest a new feature for the app -title: [FEATURE] ---- - -**Description** -What feature would you like to see? Describe it briefly. - -**Use Case** -Why is this feature important? How will it improve the app? - -**Additional Context** -Any mockups, screenshots, or references? Add them here. diff --git a/.github/ISSUE_TEMPLATE/general.md b/.github/ISSUE_TEMPLATE/general.md deleted file mode 100644 index ccb8f04f..00000000 --- a/.github/ISSUE_TEMPLATE/general.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: General Issue -about: Use this for issues that don't fit other templates -title: [GENERAL] ---- - -**Description** -What is the issue about? Brief and clear. - -**Details** -Add any relevant details or context here. - -**Additional Context** -Attach files, links, or screenshots if necessary. diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index c42433bb..890d40e8 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -1,4 +1,4 @@ -name: Develop +ikoname: Develop on: push: branches: diff --git a/pom.xml b/pom.xml index 097086f7..d42252f7 100644 --- a/pom.xml +++ b/pom.xml @@ -147,6 +147,7 @@ + ${project.basedir}/src/main/kotlin @@ -200,7 +201,7 @@ org.springframework.boot spring-boot-maven-plugin - com.kerosenelabs.billtracker.BilltrackerApplicationKt + com.kerosenelabs.billtracker.BillTrackerApplicationKt diff --git a/src/main/kotlin/com/kerosenelabs/billtracker/BilltrackerApplication.kt b/src/main/kotlin/com/kerosenelabs/billtracker/BillTrackerApplication.kt similarity index 89% rename from src/main/kotlin/com/kerosenelabs/billtracker/BilltrackerApplication.kt rename to src/main/kotlin/com/kerosenelabs/billtracker/BillTrackerApplication.kt index d2e7f272..a73f540e 100644 --- a/src/main/kotlin/com/kerosenelabs/billtracker/BilltrackerApplication.kt +++ b/src/main/kotlin/com/kerosenelabs/billtracker/BillTrackerApplication.kt @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.CrossOrigin ) @CrossOrigin @SpringBootApplication -open class BilltrackerApplication +open class BillTrackerApplication fun main(args: Array) { - runApplication(*args) + runApplication(*args) } diff --git a/src/main/kotlin/com/kerosenelabs/billtracker/controller/ExpensesController.kt b/src/main/kotlin/com/kerosenelabs/billtracker/controller/ExpensesController.kt index b8575be9..0af56dfb 100644 --- a/src/main/kotlin/com/kerosenelabs/billtracker/controller/ExpensesController.kt +++ b/src/main/kotlin/com/kerosenelabs/billtracker/controller/ExpensesController.kt @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController @RestController @Tag(name = "Expenses", description = "Personal expenses") -class ExpensesController(private val expenseService: Expens eService) { +class ExpensesController(private val expenseService: ExpenseService) { @PostMapping("/expenses/oneOffs") @ResponseStatus(HttpStatus.NO_CONTENT) fun createOneOff( @@ -53,14 +53,14 @@ class ExpensesController(private val expenseService: Expens eService) { ) } - @GetMapping("/expenses/recurringCreators") - @ResponseStatus(HttpStatus.OK) - fun getExpenses(@Parameter(hidden = true) user: UserEntity): GetRecurringExpenseEventCreatorsResponse { - return GetExpenseEventsResponse( - expenseService.(user) - .stream() - .map { entity -> expenseService.mapExpenseEventEntityToExpenseEvent(entity) } - .toList() - ) - } +// @GetMapping("/expenses/recurringCreators") +// @ResponseStatus(HttpStatus.OK) +// fun getExpenses(@Parameter(hidden = true) user: UserEntity): GetRecurringExpenseEventCreatorsResponse { +// return GetExpenseEventsResponse( +// expenseService.(user) +// .stream() +// .map { entity -> expenseService.mapExpenseEventEntityToExpenseEvent(entity) } +// .toList() +// ) +// } } diff --git a/src/main/kotlin/com/kerosenelabs/billtracker/service/ExpenseService.kt b/src/main/kotlin/com/kerosenelabs/billtracker/service/ExpenseService.kt index ca57943d..6558a062 100644 --- a/src/main/kotlin/com/kerosenelabs/billtracker/service/ExpenseService.kt +++ b/src/main/kotlin/com/kerosenelabs/billtracker/service/ExpenseService.kt @@ -89,10 +89,10 @@ class ExpenseService( * Map a RecurringExpenseEventCreatorEntity (aka an recurring expense event from the database) to a model * suitable for consumption by the user. */ - fun mapRecurringExpenseEventCreatorEntityToRecurringExpenseEventCreator(recurringExpenseEventCreator: RecurringExpenseEventCreator): RecurringExpenseEventCreator { - return RecurringExpenseEventCreator( - id = recurringExpenseEventCreator.id!!, - recursEveryCalendarDays = recurringExpenseEventCreator, - ) - } +// fun mapRecurringExpenseEventCreatorEntityToRecurringExpenseEventCreator(recurringExpenseEventCreator: RecurringExpenseEventCreator): RecurringExpenseEventCreator { +// return RecurringExpenseEventCreator( +// id = recurringExpenseEventCreator.id!!, +//// recursEveryCalendarDays = recurringExpenseEventCreator, +// ) +// } } \ No newline at end of file