Skip to content

Commit

Permalink
Merge branch 'develop' into feat/hikahana/257-stamp-api
Browse files Browse the repository at this point in the history
  • Loading branch information
hikahana authored Aug 30, 2024
2 parents bf01246 + d8339a8 commit 6bc2c54
Show file tree
Hide file tree
Showing 11 changed files with 557 additions and 137 deletions.
3 changes: 3 additions & 0 deletions api/metadata/databases/default/tables/public_reach_logs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
table:
name: reach_logs
schema: public
1 change: 1 addition & 0 deletions api/metadata/databases/default/tables/tables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
- "!include public_numbers.yaml"
- "!include public_prizes.yaml"
- "!include public_stamp_triggers.yaml"
- "!include public_reach_logs.yaml"
15 changes: 15 additions & 0 deletions api/migrations/default/1720521696814_auto/up.sql
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ CREATE TABLE public.stamp_triggers (
);
COMMENT ON TABLE public.stamp_triggers IS 'スタンプを降らせるためのAPI';
CREATE SEQUENCE public.stamp_triggers_id_seq
CREATE TABLE public.reach_logs (
id integer NOT NULL,
status boolean DEFAULT false NOT NULL,
created_at timestamp with time zone DEFAULT now() NOT NULL,
reach_num integer DEFAULT 0 NOT NULL
);
COMMENT ON TABLE public.reach_logs IS 'リーチ数を記録するテーブル';
CREATE SEQUENCE public.reach_log_id_seq
AS integer
START WITH 1
INCREMENT BY 1
Expand All @@ -84,6 +92,11 @@ ALTER TABLE ONLY public.images ALTER COLUMN id SET DEFAULT nextval('public.image
ALTER TABLE ONLY public.numbers ALTER COLUMN id SET DEFAULT nextval('public.numbers_id_seq'::regclass);
ALTER TABLE ONLY public.prizes ALTER COLUMN id SET DEFAULT nextval('public.prizes_id_seq'::regclass);
ALTER TABLE ONLY public.stamp_triggers ALTER COLUMN id SET DEFAULT nextval('public.stamp_triggers_id_seq'::regclass);
ALTER SEQUENCE public.reach_log_id_seq OWNED BY public.reach_logs.id;
ALTER TABLE ONLY public.images ALTER COLUMN id SET DEFAULT nextval('public.images_id_seq'::regclass);
ALTER TABLE ONLY public.numbers ALTER COLUMN id SET DEFAULT nextval('public.numbers_id_seq'::regclass);
ALTER TABLE ONLY public.prizes ALTER COLUMN id SET DEFAULT nextval('public.prizes_id_seq'::regclass);
ALTER TABLE ONLY public.reach_logs ALTER COLUMN id SET DEFAULT nextval('public.reach_log_id_seq'::regclass);
ALTER TABLE ONLY public.images
ADD CONSTRAINT images_pkey PRIMARY KEY (id);
ALTER TABLE ONLY public.numbers
Expand All @@ -96,5 +109,7 @@ ALTER TABLE ONLY public.stamp_triggers
ADD CONSTRAINT stamp_triggers_pkey PRIMARY KEY (id);
CREATE TRIGGER set_public_stamp_triggers_updated_at BEFORE UPDATE ON public.stamp_triggers FOR EACH ROW EXECUTE FUNCTION public.set_current_timestamp_updated_at();
COMMENT ON TRIGGER set_public_stamp_triggers_updated_at ON public.stamp_triggers IS 'trigger to set value of column "updated_at" to current timestamp on row update';
ALTER TABLE ONLY public.reach_logs
ADD CONSTRAINT reach_log_pkey PRIMARY KEY (id);
ALTER TABLE ONLY public.prizes
ADD CONSTRAINT prizes_image_id_fkey FOREIGN KEY (image_id) REFERENCES public.images(id) ON UPDATE RESTRICT ON DELETE RESTRICT;
91 changes: 27 additions & 64 deletions view-admin/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions view-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"formidable": "^3.5.1",
"fs": "^0.0.1-security",
"graphql": "^16.7.1",
"minio": "^7.1.1",
"next": "^14.2.3",
"next-auth": "^4.22.3",
"react": "^18.3.1",
Expand Down
Loading

0 comments on commit 6bc2c54

Please sign in to comment.