Browse Source

create user db if absent

Maxim Sokhatsky 11 years ago
parent
commit
61668a1f0d
2 changed files with 23 additions and 76 deletions
  1. 18 5
      apps/server/src/nsg_crowd_lib.erl
  2. 5 71
      apps/server/src/nsm_auth.erl

+ 18 - 5
apps/server/src/nsg_crowd_lib.erl

@@ -6,16 +6,29 @@
 %%% -------------------------------------------------------------------
 %%% -------------------------------------------------------------------
 
 
 -module(nsg_crowd_lib).
 -module(nsg_crowd_lib).
+-include_lib("kvs/include/user.hrl").
 
 
--export([virtual_users/0,
-         random_users/2]).
+-compile(export_all).
+
+create_users(A,B) ->
+    ImagioUsers = nsm_auth:imagionary_users(),
+    [ begin U = #user{username = nsm_auth:ima_gio(N,ImagioUsers),
+                            id = nsm_auth:ima_gio(N,ImagioUsers),
+                            birth={1981,9,29}
+                           }, kvs:put(U) end || N <- lists:seq(A, B) ].
 
 
 virtual_users() ->
 virtual_users() ->
-    {_, AllUsers} = lists:unzip(nsm_auth:imagionary_users2()),
+    case kvs:get(user,"maxim@synrc.com") of
+        {aborted,_} -> kvs:join(), kvs:init_db(),
+                create_users(1,100), kvs:put(#user{id="maxim@synrc.com"});
+        {ok,_} -> skip end,
+
+    {_, AllUsers} = lists:unzip(nsm_auth:imagionary_users()),
     F = fun(UserId, Acc) ->
     F = fun(UserId, Acc) ->
-                case auth_server:get_user_info_by_user_id(UserId) of
+        User = auth_server:get_user_info_by_user_id(UserId),
+        case User of
                     {ok, _} -> [UserId | Acc];
                     {ok, _} -> [UserId | Acc];
-                    {error, _} -> Acc
+                    {error,_} -> Acc
                 end
                 end
         end,
         end,
     lists:usort(lists:foldl(F, [], AllUsers)).
     lists:usort(lists:foldl(F, [], AllUsers)).

+ 5 - 71
apps/server/src/nsm_auth.erl

@@ -43,6 +43,8 @@ get_user_info(UserId) ->
             {error, not_found} ->
             {error, not_found} ->
                 {error, user_not_found};
                 {error, user_not_found};
             {error, notfound} ->
             {error, notfound} ->
+                {error, user_not_found};
+            {aborted, _} ->
                 {error, user_not_found}
                 {error, user_not_found}
         end,
         end,
     Reply.
     Reply.
@@ -98,78 +100,10 @@ surnames() ->
     "ozbek","ozcan","ozdemir","ozden","ozturk","pasa","polat","sezer","sahin","sen",
     "ozbek","ozcan","ozdemir","ozden","ozturk","pasa","polat","sezer","sahin","sen",
     "simsek","tekin","tosun","tunc","turan","unal","yalcin","yazici","yildirim","yilmaz"].
     "simsek","tekin","tosun","tunc","turan","unal","yalcin","yazici","yildirim","yilmaz"].
 
 
-ima_gio(N) -> {MD5,Name,Surname} = lists:nth(N,imagionary_users()), Name ++ "_" ++ Surname.
-ima_gio(N,L) -> {MD5,Name,Surname} = lists:nth(N,L), Name ++ "_" ++ Surname.
+ima_gio(N) -> {MD5,Name} = lists:nth(N,imagionary_users()), Name.
+ima_gio(N,L) -> {MD5,Name} = lists:nth(N,L), Name.
 
 
 imagionary_users() ->
 imagionary_users() ->
-    List = [{crypto:md5(X++Y),X,Y}||X<-names(),Y<-surnames()],
-    lists:keysort(1,List).
-
-imagionary_users2() ->
-    List = [{crypto:md5(X),X}||X<-imagionary_users_new()],
+    List = [{crypto:md5(X++Y),X++"_"++Y}||X<-names(),Y<-surnames()],
     lists:keysort(1,List).
     lists:keysort(1,List).
 
 
-ima_gio2(N) -> {MD5,Name} = lists:nth(N,imagionary_users2()), Name.
-ima_gio2(N,L) -> {MD5,Name} = lists:nth(N,L), Name.
-
-imagionary_users_new() -> ["1sen__olma","46ruhikizi","516tektas","54seven_","8balim","8bizim","adanali_puan_b",
-"akdeniz_aksami","ali_acar","ali_acar","ali_akbulut","ali_arslan","ali_avci","ali_ayhan","alin_yazim",
-"alp_ozgur","alp_ozkan","alp_ozturk","alp_pasa","alp_polat","alp_sahin","alp_sen","alp_sezer","alp_simsek",
-"altin_kalpler_","anisin_canims","antakya_iskend","arzu_polat","arzu_sahin","arzu_sen","arzu_sezer",
-"arzu_simsek","asena_dikmen","asena_dogan","asena_ekinci","asena_elmas","asiklar_limani",
-"asiklar_limani","asil_ve_soylu","asilbayan","asildostlar","astsubay","ask_i","aska_dair",
-"aska_dogan_gun","atesli_bayanla","atesli_wip_soh","atesli","atesli__olgun","atesli_dusler",
-"atesli_seksi","avi_melekler_","ayberk_mehmet","ayberk_mestafa","ayberk_osman","ayberk_ozbek",
-"aylincik90140","ayrilamayiz","ayrilmaz_dostl","aysu_polat","aysu_sahin","aysu_sen","aysu_sezer",
-"aysu_simsek","aysu_tekin","babacan","bahar","bahar_acar","bahar_acar","bahar_akbulut","bahar_arslan",
-"bahar_avci","bahar_ayhan","bahar_basturk","baharca_35","bahcesi","bahcem__","bak_yesilyesil",
-"bakma_gel","bal_petegim_oy","bereketi15","betul_caglar","betul_celik","betul_cetinkaya",
-"betul_demir","betul_dikmen","betul_dogan","betul_ekinci","betul_elmas","bir_sevda_masa",
-"birak","birdaha_asla","boran_karaca","boran_karadag","boran_kaya","boran_kemal","boran_keskin",
-"burcu11","bursa_bursa_oy","cafesimercan","can_dost","canemekliler","canlarvatan","cennet_gozlu",
-"cennetdeki_mel","cenneti_buldum","ceren_kemal","ceren_keskin","ceren_koc","ceren_korkmaz",
-"ceren_mehmet","cikmaz","cypress","cagla_yure","cakil_tasi","canakkale_truv","catkapi",
-"cikmazi1","d_u_z_c_eli","damla_basturk","damla_caglar","damla_celik","damla_cetinkaya",
-"damla_demir","damla_dikmen","delice","deniz_mavisi","dersim","dilara_ozcan","dilara_ozcelik",
-"dilara_ozdemir","dinle_sevgili","diyari","dogunun","doruk_caglar","doruk_celik","doruk_cetinkaya",
-"doruk_demir","dost_kervani","dostlar_mekani","dostlarin_","dostluk","dostluk_baglari","dort",
-"dudaktan_kalbe","duman_ozkan","duman_ozturk","duman_pasa","duman_polat","duman_sahin","dusler",
-"dusler_sokagi","e__x_i_hatu","ece_gunes","ece_ilhan","ece_inan","ece_karaca","ece_karadag",
-"ecem_net","eda_acar","eda_acar","eda_akbulut","eda_arslan","eda_avci","efsane_oyuncu",
-"ek_yurek","elitler5","emekliler","es_es_asiklari","eskisehir_","esmer_aci","esmer_meleg",
-"esra_yazici","esra_yildirim","esra_yilmaz","evdali","evlere_senlikk","evliler_izmir45",
-"evlilerde_seve","eylul_aksamlar","ezgi_acar","ezgi_acar","ezgi_akbulut","ezgi_arslan",
-"ezonun","fark_var","fatma_kemal","fatma_keskin","fatma_koc","fatma_korkmaz","fatma_mehmet",
-"fatma_mestafa","feshane_1","filiz_ozkan","filiz_ozturk","filiz_pasa","filiz_polat",
-"filiz_sahin","firari_asklar","flas_flas_esen","g_i_r_g_i_r_i_","gemliklinin","gencaga45",
-"gercek_dost","gizem_puan_oyu","gizli","gonul_sevd","gozlerdetutsak","gozlumsiyahbey","gonul_bah",
-"gonul_kahvesi_","gonul_limani","gozlumsamanyolu","gumbur","gunesim__puan_","gurbet",
-"gurur_duru_oke","gul_yuzlum","gulusu_yaralim","h_a_r_i_k_a_oy","h_a_w_a_l_i__p","hayal_kahve",
-"hayall_gozlumm903eyl","hayaller_men","hillaskin","hoporoz","huzur_limani","i_n_a_t_c_i___",
-"i3ir_umuttur_y","ikimizin_sevda","ikinci","inadina_soh","inci_adasi","isa_demir","isa_dikmen",
-"isa_dogan","isa_ekinci","izmit_kocaeli2","jale_polat","jale_sahin","jale_sen","jale_sezer",
-"jale_simsek","k_i_r_c_i_c_e_","kacamak","kaderim","kaderimsin_sen1","kalbimde","kalp_ayazi_",
-"karabagli","karadeniz_ordu","kastamonulu","kelebek_2_","kirik_kalp_","kirmizi_kral",
-"kizil_partizan","kizlari112537meleq_s","klasokeyci_06","kocaeli_turnuv","lacivert_sevda",
-"lale_devrii","leyla_ayhan","leyla_basturk","leyla_caglar","leyla_celik","leyla_cetinkaya",
-"limon_cicekler","mahmur_gozlum_","mardin_1_a_d_a","marmara_yildiz","marurgoz","masal_perisi_o",
-"mavi_dusss","mavi_gul","mekani1","melekler_ad","musa_yildirim","musa_yilmaz","mutevazi",
-"nartanesii_e_c","neredesin_gels","neselivadi","nil_nehrim","nilay4500kelebek_pua",
-"o_z_a_n_oyun_o","omrum_senin","ortayas_istanb","ox_aft_asill","oylum_acar","oylum_acar",
-"oylum_akbulut","oylum_arslan","oylum_avci","oyun1dost","ozan_yazici","ozan_yildirim",
-"ozan_yilmaz","olmezbursa","olumsuz_ask","ozelsin_","ozgurlukgunesi","p_a_l_m_i_y_e_",
-"p_a_l_m_i_y_e12__","p_u_a_n_41_sud","pilot","pinar_acar","pinar_acar","pinar_akbulut",
-"pinar_arslan","puan","puan_nisanyagm","puan_oyun_tatl","r_u_z_g_a_r0guz_","rdu_evicok_ozel",
-"s_e_x_x_0kara_se","sabirmelegi","sahte_olmayan_","sebebimsin_oyu","seckin_oyun_pu",
-"seheryel","sen_ve_ben_oyu","sevda_sokagi_4","sevdali_yurekl","sevdim_oyun_od",
-"sevdim0atesli","sevenler11","sevgi_denizi_y","sevgi_seli_oyu","sevil_guler",
-"sevil_gunes","sevil_ilhan","sevil_inan","seviyorumsteve","sevmek_yurek_i",
-"sevmek_yurekte","sibel","sivases","son__liman____","sonn__nefesims","sonn_nefess",
-"sozun_bittigi","stylesevgi","subay","surgun_sevda","suuuessenli","super45",
-"t_u_t_k_ucan","taner_elmas","taner_erdem","taner_erdogan","taner_guler","taner_gunes",
-"taner_ilhan","tatildeyiz","tatli_cadi","tebessum_alyan","tesbihin","trakya",
-"ugur_bocegim","uludagirtek_s","umutlar","uykulugozler","vesevgi","vural_celik",
-"vural_cetinkaya","vural_demir","vural_dikmen","vural_dogan","vural_ekinci",
-"yalniz_kalpler","yaman_puan_oda","yarimden","yenidostlar2","yenilmez11","yersu",
-"yureginizin_se","yusuf_osman","yusuf_ozbek","yusuf_ozcan","yusuf_ozcelik",
-"yusuf_ozdemir","yusuf_ozden","yureqinle_","z_i_r_v_e__","zakkumm_zakkum","zumrutgozlu"].