Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
549bedb
Merge pull request #15 from umc-timeto/develop
yeyun0423 Feb 8, 2026
10634bf
Merge pull request #16 from umc-timeto/develop
yeyun0423 Feb 8, 2026
d50f208
Merge pull request #19 from umc-timeto/develop
yeyun0423 Feb 8, 2026
962019d
Merge pull request #22 from umc-timeto/develop
yeyun0423 Feb 8, 2026
8236ce6
Merge pull request #30 from umc-timeto/develop
yeyun0423 Feb 11, 2026
3e6fca9
Merge pull request #35 from umc-timeto/develop
yeyun0423 Feb 15, 2026
236c867
Merge pull request #39 from umc-timeto/develop
yeyun0423 Feb 16, 2026
25da1a6
Merge pull request #40 from umc-timeto/develop
egaeuni Feb 16, 2026
949d9a2
Merge pull request #41 from umc-timeto/develop
yeyun0423 Feb 16, 2026
6a6ef62
Merge pull request #42 from umc-timeto/develop
yeyun0423 Feb 16, 2026
3612682
Merge pull request #43 from umc-timeto/develop
yeyun0423 Feb 16, 2026
26c1538
Merge pull request #46 from umc-timeto/develop
yeyun0423 Feb 17, 2026
d64020f
Merge pull request #49 from umc-timeto/develop
yeyun0423 Feb 18, 2026
9470c15
Merge pull request #53 from umc-timeto/develop
egaeuni Feb 19, 2026
53f769f
Merge pull request #55 from umc-timeto/develop
cccyyy333 Feb 19, 2026
5a377a2
:bug: fix: μ™Έλž˜ ν‚€ μ œμ•½ 쑰건으둜 μΈν•œ λͺ©ν‘œ μ‚­μ œ μ‹€νŒ¨ 였λ₯˜(500) μˆ˜μ •
egaeuni Feb 19, 2026
e55589c
Merge pull request #56 from umc-timeto/Fix/#51/dailyLog-fix
egaeuni Feb 19, 2026
46ba494
test: redeploy
Feb 20, 2026
1e69f0c
fix: improve CD with recreate and health check
Feb 20, 2026
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
19 changes: 17 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,20 @@ jobs:
git fetch --all
git reset --hard origin/main

docker compose -f docker-compose-dev.yml --env-file .env.prod down
docker compose -f docker-compose-dev.yml --env-file .env.prod up -d --build
docker compose -f docker-compose-dev.yml --env-file .env down || true
docker compose -f docker-compose-dev.yml --env-file .env up -d --build --force-recreate --remove-orphans

# APIκ°€ 뜰 λ•ŒκΉŒμ§€ μ΅œλŒ€ 60초 λŒ€κΈ°
for i in {1..30}; do
if curl -fsS http://127.0.0.1:8080/v3/api-docs > /dev/null; then
echo "API is up"
exit 0
fi
sleep 2
done

echo "API did not become ready"
docker ps -a
docker logs timeto-app-dev --tail 200
exit 1

8 changes: 8 additions & 0 deletions src/main/java/com/umc/timeto/folder/entity/Folder.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.umc.timeto.folder.entity;

import com.umc.timeto.goal.entity.Goal;
import com.umc.timeto.todo.domain.Todo;
import jakarta.persistence.*;
import lombok.*;

import java.util.ArrayList;
import java.util.List;

@Entity
@Getter
@Builder
Expand All @@ -25,6 +29,10 @@ public class Folder {
@JoinColumn(name = "goal_id", nullable = false)
private Goal goal;

@Builder.Default
@OneToMany(mappedBy = "folder", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Todo> todos = new ArrayList<>();

public Folder(String name, Goal goal) {
this.name = name;
this.goal = goal;
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/umc/timeto/goal/entity/Goal.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.umc.timeto.goal.entity;

import com.umc.timeto.folder.entity.Folder;
import com.umc.timeto.member.entity.Member;
import jakarta.persistence.*;
import lombok.*;

import java.util.ArrayList;
import java.util.List;

@Entity
@Getter
@Setter
Expand All @@ -24,6 +28,10 @@ public class Goal {
@JoinColumn(name="member_id")
private Member member;

@Builder.Default
@OneToMany(mappedBy = "goal", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Folder> folders = new ArrayList<>();

public void update(String name, String color) {
this.name = name;
this.color = color;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/umc/timeto/todo/domain/Todo.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public void changeSortOrder(Integer sortOrder) {
@JoinColumn(name = "folder_id", nullable = false)
private Folder folder;


//todo μ‚­μ œ μ‹œ μ—°κ²°λœ block μžλ™ μ‚­μ œ
@OneToOne(
mappedBy = "todo",
Expand Down