Ignore:
Timestamp:
10/01/20 03:17:09 (2 years ago)
Author:
DimitarSlezenkovski <dslezenkovski@…>
Branches:
master
Children:
6f203af
Parents:
5d02859
Message:

Change structure, Add repo, services & controllers

Location:
FarmatikoServices/Services
Files:
2 added
7 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • FarmatikoServices/Services/ProcessJSONService.cs

    r5d02859 r1454207  
    1111using RestSharp;
    1212using System.Threading.Tasks;
     13using OfficeOpenXml;
     14using System.IO;
    1315
    1416namespace FarmatikoServices.Services
     
    1618    public class ProcessJSONService : IProcessJSONService
    1719    {
    18         private IHealthFacilityRepository _healthFacilityRepository;
    19         private IPandemicRepository _pandemicRepository;
    20         private IHealthcareWorkerRepository _healthcareWorkerRepository;
    21         private IMedicineRepository _medicineRepository;
     20
    2221        private readonly ILogger _logger;
    23         public ProcessJSONService(IHealthFacilityRepository healthFacilityRepository, IPandemicRepository pandemicRepository,
    24             IHealthcareWorkerRepository healthcareWorkerRepository, IMedicineRepository medicineRepository, ILogger logger)
     22        private readonly IService _service;
     23        public ProcessJSONService(ILogger logger, IService service)
    2524        {
    2625            _logger = logger;
    27             _healthFacilityRepository = healthFacilityRepository;
    28             _pandemicRepository = pandemicRepository;
    29             _healthcareWorkerRepository = healthcareWorkerRepository;
    30             _medicineRepository = medicineRepository;
     26            _service = service;
    3127        }
    3228
    33         public async Task<HashSet<HealthFacilities>> GetProcessedHealthFacilitiesFromJSON()
     29        public async Task<Medicine> ReadPharmaciesFromExcel()
     30        {
     31            var client = new WebClient();
     32            string Path = client.DownloadString(@"C:\Users\dslez\Desktop\apteki-fzo.xlsx");
     33            using (var package = new ExcelPackage(new FileInfo(Path)))
     34            {
     35                var Sheet = package.Workbook.Worksheets[1];
     36                for (int i = 2; i < Sheet.Dimension.End.Row; ++i)
     37                {
     38                    Pharmacy pharmacy = new Pharmacy()
     39                    {
     40                        Name = Sheet.Cells[i, 2].Value.ToString(),
     41                        Address = Sheet.Cells[i, 3].Value.ToString(),
     42                        Location = Sheet.Cells[i, 4].Value.ToString(),
     43                        WorkAllTime = false
     44                    };
     45                    await _service.AddPharmacy(pharmacy);
     46                }
     47            }
     48            return null;
     49        }
     50
     51
     52        public async Task<HealthFacility> GetProcessedHealthFacilitiesFromJSON()
    3453        {
    3554            try
    3655            {
    37                 HashSet<HealthFacilities> hashSet = new HashSet<HealthFacilities>();
    3856                var client = new WebClient();
    3957                var json = client.DownloadString(@"C:\Users\dslez\Desktop\ustanovi.json");
     
    5169                    var Phone = obj[11];
    5270                    var Type = obj[5];
    53                     HealthFacilities healthFacility = new HealthFacilities(Name, Municipality, Address, Type, Email, Phone);
    54                     /*healthFacility.Name = Name;
    55                     healthFacility.Municipality = Municipality;
    56                     healthFacility.Address = Address;
    57                     healthFacility.Email = Email;
    58                     healthFacility.Phone = Phone;
    59                     healthFacility.Type = Type;*/
    60                     //hashSet.Add(healthFacility);
    61                     await Task.Run(() => _healthFacilityRepository.Add(healthFacility));
     71                    HealthFacility healthFacility = new HealthFacility(Name, Municipality, Address, Type, Email, Phone);
     72                    await Task.Run(() => _service.AddFacility(healthFacility));
    6273
    6374                }
     
    7283        }
    7384
    74         public async Task<HashSet<Pandemic>> GetProcessedPandemicsFromJSONApi()
     85        public async Task<Pandemic> GetProcessedPandemicsFromJSONApi()
    7586        {
    7687            try
     
    97108
    98109                Pandemic pandemic = new Pandemic(Name, TotalMk, ActiveMk, TotalDeathsMK, NewMK, TotalConfirmed, TotalDeaths, ActiveGlobal);
    99                 /*pandemic.TotalGlobal = TotalConfirmed;
    100                 pandemic.ActiveGlobal = TotalConfirmed - (TotalRecovered + TotalDeaths);
    101                 pandemic.DeathsGlobal = TotalDeaths;
    102                 pandemic.TotalMK = TotalMk;
    103                 pandemic.ActiveMK = TotalMk - (TotalRecoveredMK + TotalDeathsMK);
    104                 pandemic.DeathsMK = TotalDeathsMK;
    105                 pandemic.NewMK = NewMK;
    106                 pandemic.Name = "Coronavirus";*/
    107                 await Task.Run(() => _pandemicRepository.Add(pandemic));
     110                await Task.Run(() => _service.AddPandemic(pandemic));
    108111            }
    109112            catch (Exception e)
     
    114117        }
    115118
    116         public async Task<HashSet<HealthcareWorkers>> GetProcessedHealthcareWorkersFromJSON()
     119        public async Task<HealthcareWorker> GetProcessedHealthcareWorkersFromJSON()
    117120        {
    118121            try
     
    131134                    var FacilityName = obj[1];
    132135                    var Title = obj[3];
    133                     HealthFacilities facility = _healthFacilityRepository.GetByName(FacilityName);
    134                     HealthFacilities Facility = new HealthFacilities(facility.Name, facility.Municipality, facility.Address,
     136                    HealthFacility facility = await _service.GetFacilityJSON(FacilityName);
     137                    HealthFacility Facility = new HealthFacility(facility.Name, facility.Municipality, facility.Address,
    135138                                                                        facility.Type, facility.Email, facility.Phone);
    136                     HealthcareWorkers healthcareWorker = new HealthcareWorkers(Name, Branch, Facility, Title);
     139                    HealthcareWorker healthcareWorker = new HealthcareWorker(Name, Branch, Facility, Title);
    137140                    /*Facility.Name = obj[1];
    138141                    Facility.Municipality = "WorkerFacilityMunicipality";
     
    142145                    healthcareWorker.Facility = Facility;
    143146                    healthcareWorker.Title = Title;*/
    144                     await Task.Run(() => _healthcareWorkerRepository.Add(healthcareWorker));
     147                    await Task.Run(() => _service.AddWorker(healthcareWorker));
    145148                }
    146149            }
     
    152155        }
    153156
    154         public async Task<HashSet<Medicine>> GetProcessedMedicinesFromJSON()
     157        public async Task<Medicine> GetProcessedMedicinesFromJSON()
    155158        {
    156159            try
     
    180183                    medicine.Price = Price;
    181184                    medicine.Packaging = Packaging;*/
    182                     await Task.Run(() => _medicineRepository.Add(medicine));
     185                    await Task.Run(() => _service.AddMedicines(medicine));
    183186                }
    184187            }
  • FarmatikoServices/Services/Service.cs

    r5d02859 r1454207  
    1717
    1818        //GET
    19         public async Task<IQueryable<HealthcareWorkers>> GetAllWorkers()
     19        public async Task<IQueryable<HealthcareWorker>> GetAllWorkers()
    2020        {
    2121            var Workers = await _repository.GetAllWorkers();
     
    2323        }
    2424
    25         public async Task<IQueryable<HealthFacilities>> GetFacilities()
     25        public async Task<IQueryable<HealthFacility>> GetFacilities()
    2626        {
    2727            var Facilities = await _repository.GetFacilities();
     
    2929        }
    3030
    31         public async Task<HealthFacilities> GetFacility(int id)
     31        public async Task<HealthFacility> GetFacility(int id)
    3232        {
    3333            var Facility = await _repository.GetFacility(id);
     
    6565        }
    6666
    67         public async Task<HealthcareWorkers> GetWorker(int id)
     67        public async Task<HealthcareWorker> GetWorker(int id)
    6868        {
    6969            var Worker = await _repository.GetWorker(id);
     
    7171        }
    7272
    73         public async Task<IQueryable<HealthFacilities>> SearchFacilities(string query)
     73        public async Task<IQueryable<HealthFacility>> SearchFacilities(string query)
    7474        {
    7575            var SearchQuery = await _repository.SearchFacilities(query);
     
    8989        }
    9090
    91         public async Task<IQueryable<HealthcareWorkers>> SearchWorkers(string query)
     91        public async Task<IQueryable<HealthcareWorker>> SearchWorkers(string query)
    9292        {
    9393            var SearchQuery = await _repository.SearchWorkers(query);
     
    9797
    9898        //POST (ADD NEW OBJECTS)
    99         public Task AddFacility(HealthFacilities healthFacilities)
     99        //za json(Sys updateer)
     100        public async Task AddFacility(HealthFacility healthFacilities)
    100101        {
    101102            if (healthFacilities != null)
    102                 _repository.AddFacility(healthFacilities);
     103                await _repository.AddFacility(healthFacilities);
    103104            throw new Exception("Facility is null");
    104105        }
    105 
    106         public Task AddMedicines(Medicine medicine)
     106        //za json(Sys updateer)
     107        public async Task AddMedicines(Medicine medicine)
    107108        {
    108109            if (medicine != null)
    109                 _repository.AddMedicines(medicine);
     110                await _repository.AddMedicines(medicine);
    110111            throw new Exception("Medicine is null");
    111112        }
    112 
    113         public Task AddPandemic(Pandemic pandemic)
     113        //za json(Sys updateer)
     114        public async Task AddPandemic(Pandemic pandemic)
    114115        {
    115116            if (pandemic != null)
    116                 _repository.AddPandemic(pandemic);
     117                await _repository.AddPandemic(pandemic);
    117118            throw new Exception("Pandemic is null");
    118119        }
    119 
    120         public Task AddPharmacy(Pharmacy pharmacy)
     120        // Samo PharmacyHead i Admin imaat pristap
     121        public async Task AddPharmacy(Pharmacy pharmacy)
    121122        {
    122123            if (pharmacy != null)
    123                 _repository.AddPharmacy(pharmacy);
     124                await _repository.AddPharmacy(pharmacy);
    124125            throw new Exception("Pharmacy is null");
    125126        }
    126 
    127         public Task AddPharmacyHead(PharmacyHead pharmacyHead)
     127        // Ovaa kontrola ja ima samo admin
     128        public async Task AddPharmacyHead(PharmacyHead pharmacyHead)
    128129        {
    129130            if (pharmacyHead != null)
    130                 _repository.AddPharmacyHead(pharmacyHead);
     131            {
     132                var Medicines = await _repository.GetMedicines();
     133                foreach (var med in Medicines)
     134                {
     135                    MedicineList medicine = new MedicineList()
     136                    {
     137                        Medicine = med,
     138                        HasMedicine = false
     139                    };
     140                    pharmacyHead.MedicineLists.Add(medicine);
     141                }
     142                await _repository.AddPharmacyHead(pharmacyHead);
     143            }
    131144            throw new Exception("PharmacyHead is null");
    132145        }
    133 
    134         public Task AddWorker(HealthcareWorkers worker)
     146        //za json(Sys updateer)
     147        public async Task AddWorker(HealthcareWorker worker)
    135148        {
    136149            if (worker != null)
    137                 _repository.AddWorker(worker);
     150                await _repository.AddWorker(worker);
    138151            throw new Exception("Worker is null");
     152        }
     153
     154        //za json(Sys updateer)
     155        public async Task UpdateFacility(HealthFacility healthFacilities)
     156        {
     157            if (healthFacilities != null)
     158                await _repository.UpdateFacility(healthFacilities);
     159            throw new Exception("Facility is null");
     160        }
     161        //PharmacyHead
     162        public async Task RemoveMedicine(Medicine medicine)
     163        {
     164            if (medicine != null)
     165                await _repository.RemoveMedicine(medicine);
     166            throw new Exception("Medicine is null");
     167        }
     168        //PharmacyHead
     169        public async Task UpdateMedicine(Medicine medicine)
     170        {
     171            if (medicine != null)
     172                await _repository.UpdateMedicine(medicine);
     173            throw new Exception("Medicine is null");
     174        }
     175        //za json(Sys updateer)
     176        public async Task UpdatePandemic(Pandemic pandemic)
     177        {
     178            if (pandemic != null)
     179                await _repository.UpdatePandemic(pandemic);
     180            throw new Exception("Pandemic is null");
     181        }
     182        //PharmacyHead
     183        public async Task RemovePharmacy(Pharmacy pharmacy)
     184        {
     185            if (pharmacy != null)
     186                await _repository.RemovePharmacy(pharmacy);
     187            throw new Exception("Pharmacy is null");
     188        }
     189        //PharamcyHead
     190        public async Task UpdatePharmacy(Pharmacy pharmacy)
     191        {
     192            if (pharmacy != null)
     193                await _repository.UpadatePharmacy(pharmacy);
     194            throw new Exception("Pharmacy is null");
     195        }
     196        //za json(Sys updateer)
     197        public async Task UpdateWorker(HealthcareWorker worker)
     198        {
     199            if (worker != null)
     200                await _repository.UpdateWorker(worker);
     201            throw new Exception("Worker is null");
     202        }
     203
     204        public async Task RemovePharmacyHead(PharmacyHead pharmacyHead)
     205        {
     206            if (pharmacyHead != null)
     207            {
     208                pharmacyHead.DeletedOn = DateTime.UtcNow;
     209                await _repository.RemovePharmacyHead(pharmacyHead);
     210            }
     211            else throw new Exception("PharmacyHead is null.");
     212        }
     213
     214        public async Task<HealthFacility> GetFacilityJSON(string healthFacility)
     215        {
     216            if (healthFacility != null)
     217                return await _repository.GetFacilityJSON(healthFacility);
     218            return null;
    139219        }
    140220
Note: See TracChangeset for help on using the changeset viewer.