From 4f962bb104932b6e1581b97f3d16d1e3726b653f Mon Sep 17 00:00:00 2001 From: nochill Date: Tue, 12 Sep 2023 12:52:01 +0700 Subject: [PATCH] add data seed and updae users table --- Makefile | 7 ++++++- db/{ => csv_seeder}/kabupaten.csv | 0 db/csv_seeder/locations.csv | 10 ++++++++++ db/{ => csv_seeder}/provinsi.csv | 0 db/{ => csv_seeder}/regions.csv | 0 db/csv_seeder/user.csv | 2 ++ db/locations.csv | 0 db/migrations/000001_init_schema.up.sql | 10 +++++----- import_csv.sh | 16 ++++++++++++++++ 9 files changed, 39 insertions(+), 6 deletions(-) rename db/{ => csv_seeder}/kabupaten.csv (100%) create mode 100644 db/csv_seeder/locations.csv rename db/{ => csv_seeder}/provinsi.csv (100%) rename db/{ => csv_seeder}/regions.csv (100%) create mode 100644 db/csv_seeder/user.csv delete mode 100644 db/locations.csv create mode 100755 import_csv.sh diff --git a/Makefile b/Makefile index 180bfe3..dfde1a2 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,17 @@ include dev.env migrateup: migrate -path db/migrations -database "${DB_TYPE}://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=disable" -verbose up + migrate -path db/migrations -database "${DB_TYPE}://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}_test?sslmode=disable" -verbose up migratedown: migrate -path db/migrations -database "${DB_TYPE}://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=disable" -verbose down $N + migrate -path db/migrations -database "${DB_TYPE}://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}_test?sslmode=disable" -verbose down $N + +seed: + ./import_csv.sh mock-generate: - mockgen -package mockdb -destination db/mock/store.go git.nochill.in/nochill/naice_pos/db/sqlc Store + mockgen -package mockdb -destination db/mock/store.go git.nochill.in/nochill/hiling_go/db/sqlc Store sqlc: sqlc generate && make mock-generate diff --git a/db/kabupaten.csv b/db/csv_seeder/kabupaten.csv similarity index 100% rename from db/kabupaten.csv rename to db/csv_seeder/kabupaten.csv diff --git a/db/csv_seeder/locations.csv b/db/csv_seeder/locations.csv new file mode 100644 index 0000000..9a3cbcd --- /dev/null +++ b/db/csv_seeder/locations.csv @@ -0,0 +1,10 @@ +id#address#name#submitted_by#thumbnail#regency_id#google_maps_link +1#Jalan Raya Beside the bridge Ubud#Murni’s Warung#1#https://cdn.discordapp.com/attachments/743422487882104837/1150972798320267304/image.png#5104#https://www.google.com/maps/place/Murni's+Warung/@-8.5048696,115.2553417,19z/data=!4m6!3m5!1s0x2dd23d3e0ffaa071:0xf2fa69b4cb211e41!8m2!3d-8.5051184!4d115.2547196!16s%2Fg%2F1tdsmcq7?entry=ttu +2#Jl.Taman Wijaya Kusuma Ps. Baru Kecamatan Sawah Besar#Masjid Istiqlal#1#https://dynamic-media-cdn.tripadvisor.com/media/photo-o/04/11/31/33/istiqlal-mosque-mesjid.jpg?w=500&h=-1&s=1#3173#https://www.google.com/maps/place/Masjid+Istiqlal/@-6.1703155,106.8308434,19z/data=!4m15!1m7!3m6!1s0x2e69f5ce68b5e01d:0xcafaf042d5840c6c!2sMasjid+Istiqlal!8m2!3d-6.17017!4d106.83139!16zL20vMDRzam1q!3m6!1s0x2e69f5ce68b5e01d:0xcafaf042d5840c6c!8m2!3d-6.17017!4d106.83139!15sCg9tYXNqaWQgaXN0aXFsYWxaESIPbWFzamlkIGlzdGlxbGFskgEGbW9zcXVl4AEA!16zL20vMDRzam1q?entry=ttu +3#Jl. Mayjend Sungkono no. 89#Hotel Ciputra World Surabaya#1#https://lh5.googleusercontent.com/p/AF1QipOvHDO-M6riRoqBrWU3MskhwL_bue8JmN9faq7Q=w500-h500-k-no#3578#https://www.google.com/maps/place/Ciputra+World+Hotel+Surabaya/@-7.2923061,112.7191552,15z/data=!4m2!3m1!1s0x0:0x736a9c49dcc2ac42?sa=X&ved=2ahUKEwjJlbf8gqSBAxWtzzgGHUIkBFYQ_BJ6BAgVEAA&ved=2ahUKEwjJlbf8gqSBAxWtzzgGHUIkBFYQ_BJ6BAgjEAc +4#Jl. Taman Safari No.101 . B Cibeureum Kec. Cisarua#Club Huis#1#https://media-cdn.tripadvisor.com/media/photo-o/0d/6a/5d/63/our-peaceful-backyard.jpg#3201#https://www.google.com/maps/place/Club+Huis/@-6.7027857,106.9453741,17z/data=!3m1!4b1!4m6!3m5!1s0x2e69b679d7a09e01:0xf9fc2df396f09977!8m2!3d-6.7027857!4d106.947949!16s%2Fg%2F11c57lh8ky?entry=ttu +5#Desa Tambakrejo Kecamatan Sumbermanjing Wetan#Pulau Sempu#1#https://dynamic-media-cdn.tripadvisor.com/media/photo-o/11/3b/06/a5/pulau-sempu.jpg?w=500&h=-1&s=1#3507#https://www.google.com/maps/place/Pulau+Sempu/@-8.446621,112.6746143,14z/data=!3m1!4b1!4m6!3m5!1s0x2dd60120edbc901f:0x8efd89687a308993!8m2!3d-8.4428564!4d112.6973355!16s%2Fm%2F0r8k540?entry=ttu +6#Jl. Bukit Golf I BSD Sektor VI Lengkong Karya Kec. Serpong Utara#Damai Indah Golf#1#https://lh3.googleusercontent.com/p/AF1QipN5Z-0J6vIfIO6gqPO0z5HDWlNKqp0t816XIJPS=s680-w500-h500#3674#https://www.google.com/maps/place/Damai+Indah+Golf+-+BSD+Course/@-6.2815644,106.6496566,17z/data=!3m1!4b1!4m6!3m5!1s0x2e69fb152983d973:0x89e58e219f8b93ef!8m2!3d-6.2815644!4d106.6522315!16s%2Fg%2F11c54c9r94?entry=ttu +7#Jl. P. Mangkubumi No.72A Cokrodiningratan Kec. Jetis#Hotel Tentrem Yogyakarta#1#https://cdn.discordapp.com/attachments/743422487882104837/1150987888553623653/image.png#3471#https://www.google.com/maps?q=Hotel+Tentrem+Yogyakarta&source=lmns&entry=mc&bih=1115&biw=2124&hl=en-US&sa=X&ved=2ahUKEwjjl-HHiKSBAxUu5jgGHTU3BiwQ0pQJKAJ6BAgBEAY +8#Moluo Kec.Kwandang#Pulau Saronde Gorontalo#1#https://dynamic-media-cdn.tripadvisor.com/media/photo-o/0d/ec/58/21/saronde-island-a-place.jpg?w=700&h=-1&s=1#7505#https://www.google.com/maps/place/Pulau+Saronde+Gorontalo/@0.9263376,122.8613201,17z/data=!3m1!4b1!4m6!3m5!1s0x32795bf34dff4467:0xa8beb2a832ae8176!8m2!3d0.9263376!4d122.863895!16s%2Fg%2F11l241cc1d?hl=id&entry=ttu +9#Dusun Katiet Desa Bosua Kecamatan Sipora#Pantai Katiet#1#https://dynamic-media-cdn.tripadvisor.com/media/photo-o/1a/d7/fe/f4/mentawai-islands.jpg?w=500&h=-1&s=1#1301#https://www.google.com/maps/place/Katiet,+Bosua,+Sipora+Selatan,+Mentawai+Islands+Regency,+West+Sumatra/@-2.375793,99.848187,15z/data=!3m1!4b1!4m6!3m5!1s0x2fd27efa8363912f:0x8c9c19bd76cba179!8m2!3d-2.375793!4d99.848187!16s%2Fg%2F1tcwz0mt?hl=en-US&entry=ttu \ No newline at end of file diff --git a/db/provinsi.csv b/db/csv_seeder/provinsi.csv similarity index 100% rename from db/provinsi.csv rename to db/csv_seeder/provinsi.csv diff --git a/db/regions.csv b/db/csv_seeder/regions.csv similarity index 100% rename from db/regions.csv rename to db/csv_seeder/regions.csv diff --git a/db/csv_seeder/user.csv b/db/csv_seeder/user.csv new file mode 100644 index 0000000..c2e1c8b --- /dev/null +++ b/db/csv_seeder/user.csv @@ -0,0 +1,2 @@ +id,username,password +1,user123,password \ No newline at end of file diff --git a/db/locations.csv b/db/locations.csv deleted file mode 100644 index e69de29..0000000 diff --git a/db/migrations/000001_init_schema.up.sql b/db/migrations/000001_init_schema.up.sql index 8845a81..9bc17fe 100644 --- a/db/migrations/000001_init_schema.up.sql +++ b/db/migrations/000001_init_schema.up.sql @@ -1,8 +1,8 @@ CREATE TABLE users( "id" serial primary key not null, "email" varchar unique, - "username" varchar unique, - "password" varchar, + "username" varchar unique not null, + "password" varchar not null, "avatar_picture" varchar, "google_sign_in_payload" varchar, "banned_at" timestamp, @@ -75,12 +75,12 @@ CREATE TABLE regencies( CREATE TABLE locations( "id" serial primary key not null, - "address" varchar, - "name" varchar, + "address" varchar not null, + "name" varchar not null, "google_maps_link" varchar, "submitted_by" integer references "users"("id") not null, "total_visited" integer, - "thumbnail" varchar, + "thumbnail" varchar not null, "regency_id" smallint references "regencies"("id") not null, "is_deleted" boolean, "created_at" timestamp default(now()), diff --git a/import_csv.sh b/import_csv.sh new file mode 100755 index 0000000..131c83b --- /dev/null +++ b/import_csv.sh @@ -0,0 +1,16 @@ +#!/bin/sh +cp ./db/csv_seeder/* /tmp/ +sudo -u postgres psql \ + -c '\copy users(id,username,password) FROM '"'/tmp/user.csv'"' DELIMITER '"','"' CSV HEADER;' \ + -c '\copy regions(id, region_name) FROM '"'/tmp/regions.csv'"' DELIMITER '"','"' CSV HEADER;' \ + -c '\copy provinces(id, province_name, region_id) FROM '"'/tmp/provinsi.csv'"' DELIMITER '"','"' CSV HEADER;' \ + -c '\copy regencies(id, province_id, regency_name) FROM '"'/tmp/kabupaten.csv'"' DELIMITER '"','"' CSV HEADER;' \ + -c '\copy locations(id,address,name,submitted_by,thumbnail,regency_id,google_maps_link) FROM '"'/tmp/locations.csv'"' DELIMITER '"'#'"' CSV HEADER;' \ + -d hiling_dev && +sudo -u postgres psql \ + -c '\copy users(id,username,password) FROM '"'/tmp/user.csv'"' DELIMITER '"','"' CSV HEADER;' \ + -c '\copy regions(id, region_name) FROM '"'/tmp/regions.csv'"' DELIMITER '"','"' CSV HEADER;' \ + -c '\copy provinces(id, province_name, region_id) FROM '"'/tmp/provinsi.csv'"' DELIMITER '"','"' CSV HEADER;' \ + -c '\copy regencies(id, province_id, regency_name) FROM '"'/tmp/kabupaten.csv'"' DELIMITER '"','"' CSV HEADER;' \ + -c '\copy locations(id,address,name,submitted_by,thumbnail,regency_id,google_maps_link) FROM '"'/tmp/locations.csv'"' DELIMITER '"'#'"' CSV HEADER;' \ + -d hiling_dev_test